From 655f9872b82c9ce3385c9e7e4a9ee450731a5f58 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Fri, 10 Aug 2018 14:25:30 +0100
Subject: fixup! build: Add GitLab CI support

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ef52c9..3bbe08f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,9 @@ stages:
   - test
   - deploy
 
+variables:
+  MESON_TEST_TIMEOUT_MULTIPLIER: 2
+
 build-job:
   stage: build
   script:
@@ -24,15 +27,26 @@ build-job:
     when: on_failure
     name: "dconf-_${CI_COMMIT_REF_NAME}"
     paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - "_build/meson-logs"
 
 test:
   stage: test
   script:
     - meson _build . -Db_coverage=true
-    - ninja -C _build test
-    - ninja -C _build coverage
+    - ninja -C _build
+    - mkdir -p _coverage
+    - lcov --rc lcov_branch_coverage=1 --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
+    - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
+    - lcov --rc lcov_branch_coverage=1 --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
   coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
+  except:
+    - tags
+  artifacts:
+    when: on_failure
+    name: "dconf-_${CI_COMMIT_REF_NAME}"
+    paths:
+      - "_build/meson-logs"
+      - "_coverage"
 
 # FIXME: Run gtkdoc-check when we can. See:
 # https://github.com/mesonbuild/meson/issues/3580
@@ -46,19 +60,18 @@ dist-job:
     - ninja -C _build dist
   artifacts:
     paths:
-      - "${CI_PROJECT_DIR}/_build/meson-dist/dconf-*.tar.xz"
+      - "_build/meson-dist/dconf-*.tar.xz"
 
 pages:
   stage: deploy
   only:
     - master
   script:
-    - meson -Db_coverage=true -Ddocumentation=true _build .
-    - ninja -C _build test dconf-doc
-    - ninja -C _build coverage
+    - meson -Ddocumentation=true _build .
+    - ninja -C _build dconf-doc
     - mkdir -p public/
     - mv _build/dconf/docs/html/ public/docs/
-    - mv _build/meson-logs/coveragereport/ public/coverage/
+    - mv _coverage/ public/coverage/
   artifacts:
     paths:
       - public
\ No newline at end of file
-- 
cgit v1.2.1