From 5aeb8ff6a6a585e7c12e42e45d99208fe296594a Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 23 Jul 2020 13:55:01 +0200 Subject: ci: Make the coverage build happen in the coverage target 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). --- .gitlab-ci.yml | 9 +++++---- 1 file 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: -- cgit v1.2.1