From b4c909b8bfa25a7b7584fc31647243b76cac7a13 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@src.gnome.org>
Date: Wed, 5 Jun 2019 11:39:30 +0200
Subject: [PATCH 1/2] gitlab-ci: Switch to fedora:28 to fedora:latest

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d03377..b1790ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   DEPENDENCIES: dbus-x11 gcc gjs make python3-dbus python3-gobject redhat-rpm-config
 
 fedora:Werror:
-  image: fedora:28
+  image: fedora:latest
   stage: build
   before_script:
     - dnf upgrade -y
@@ -21,7 +21,7 @@ fedora:Werror:
     - make -j$(nproc) V=1 distcheck
 
 fedora:asan:
-  image: fedora:28
+  image: fedora:latest
   stage: build
   before_script:
     - dnf upgrade -y
@@ -36,7 +36,7 @@ fedora:asan:
     - make -j$(nproc) V=1 DISABLE_HARD_ERRORS=1 XFAIL_TESTS="\$(JS_TESTS) \$(PY_TESTS)" check
 
 fedora:ubsan:
-  image: fedora:28
+  image: fedora:latest
   stage: build
   before_script:
     - dnf upgrade -y
@@ -51,7 +51,7 @@ fedora:ubsan:
     - make -j$(nproc) V=1 check
 
 fedora:coverage:
-  image: fedora:28
+  image: fedora:latest
   stage: build
   before_script:
     - dnf upgrade -y

From 339c19e7ed51a6aed4dd16902e3eeb5a556c155d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@src.gnome.org>
Date: Wed, 5 Jun 2019 11:46:15 +0200
Subject: [PATCH 2/2] gitlab-ci: Use meson instead of autotools

---
 .gitlab-ci.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1790ba..4638e30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - deploy
 
 variables:
-  DEPENDENCIES: dbus-x11 gcc gjs make python3-dbus python3-gobject redhat-rpm-config
+  DEPENDENCIES: dbus-x11 gcc gjs meson ninja-build python3-dbus python3-gobject redhat-rpm-config
 
 fedora:Werror:
   image: fedora:latest
@@ -15,10 +15,9 @@ fedora:Werror:
     - dnf install -y $DEPENDENCIES
     - dbus-uuidgen --ensure
   script:
-    - ./autogen.sh --disable-dependency-tracking --enable-strict
-    - make -j$(nproc) V=1
+    - meson _build -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations
     - eval `dbus-launch --sh-syntax`
-    - make -j$(nproc) V=1 distcheck
+    - meson test -C _build
 
 fedora:asan:
   image: fedora:latest
@@ -30,10 +29,9 @@ fedora:asan:
     - dnf install -y $DEPENDENCIES libasan
     - dbus-uuidgen --ensure
   script:
-    - ./autogen.sh --disable-dependency-tracking CFLAGS='-fsanitize=address -g -fno-common -U_FORTIFY_SOURCE' CXXFLAGS='-fsanitize=address -g -fno-common -U_FORTIFY_SOURCE' LDFLAGS='-fsanitize=address -g -fno-common -U_FORTIFY_SOURCE' LIBS='-lasan -ldl -lpthread'
-    - make -j$(nproc) V=1
+    - meson _build -Dsanitize=address
     - eval `dbus-launch --sh-syntax`
-    - make -j$(nproc) V=1 DISABLE_HARD_ERRORS=1 XFAIL_TESTS="\$(JS_TESTS) \$(PY_TESTS)" check
+    - meson test -C _build
 
 fedora:ubsan:
   image: fedora:latest
@@ -45,10 +43,9 @@ fedora:ubsan:
     - dnf install -y $DEPENDENCIES libubsan
     - dbus-uuidgen --ensure
   script:
-    - ./autogen.sh --disable-dependency-tracking CFLAGS='-fsanitize=undefined -g -fno-common -U_FORTIFY_SOURCE' CXXFLAGS='-fsanitize=undefined -g -fno-common -U_FORTIFY_SOURCE' LDFLAGS='-fsanitize=undefined -g -fno-common -U_FORTIFY_SOURCE' LIBS='-lubsan -ldl -lpthread'
-    - make -j$(nproc) V=1
+    - meson _build -Dsanitize=undefined
     - eval `dbus-launch --sh-syntax`
-    - make -j$(nproc) V=1 check
+    - meson test -C _build
 
 fedora:coverage:
   image: fedora:latest
@@ -60,21 +57,20 @@ fedora:coverage:
     - dnf install -y $DEPENDENCIES lcov
     - dbus-uuidgen --ensure
   script:
-    - ./autogen.sh --disable-dependency-tracking --enable-coverage
-    - make -j$(nproc) V=1
+    - meson _build -Db_coverage=true
     - eval `dbus-launch --sh-syntax`
-    - make -j$(nproc) V=1 check
-    - make coverage
+    - meson test -C _build
+    - ninja coverage-html -C _build
   coverage: '/^\s+lines.+:\s+([\d.]+\%)\s+/'
   artifacts:
     name: "libsecret-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     paths:
-      - build/coverage/
+      - _build/meson-logs/coveragereport/
 
 pages:
   stage: deploy
   script:
-    - mv build/coverage/ public/
+    - mv _build/meson-logs/coveragereport/ public/
   artifacts:
     paths:
       - public