summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2020-07-23 13:55:01 +0200
committerCarlos Garnacho <carlosg@gnome.org>2020-07-23 13:55:01 +0200
commit5aeb8ff6a6a585e7c12e42e45d99208fe296594a (patch)
treea252474ff0ca94ee4f18b7ce24c8db84dd73d34c
parent0aa4bab53931a0906dfabed1095afbd2ae705177 (diff)
downloadmutter-wip/carlosg/shuffle-coverage.tar.gz
ci: Make the coverage build happen in the coverage targetwip/carlosg/shuffle-coverage
Use a specific build for it, instead of making the default test-mutter target prepare that in advance, just in case. Bypasses errors with recent meson when making coverage builds (although it'd still happen if the stage were run manually).
-rw-r--r--.gitlab-ci.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef9a912e8..a6a13c1aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ check-commit-log:
build-mutter:
stage: build
script:
- - meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
+ - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
- ninja -C build
- ninja -C build install
artifacts:
@@ -85,11 +85,12 @@ test-mutter-coverage:
dependencies:
- test-mutter
script:
- - ninja -C build coverage
- - cat build/meson-logs/coverage.txt
+ - meson . coverage-build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
+ - ninja -C coverage-build coverage
+ - cat coverage-build/meson-logs/coverage.txt
artifacts:
paths:
- - build/meson-logs
+ - coverage-build/meson-logs
when: manual
except:
refs: