summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-06-05 13:58:48 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2018-06-05 13:58:48 -0400
commita4ccb4972cf42e9376c961a5b2c24c28c27e2143 (patch)
tree5fa638a257724bfc9ca5d0424dbb83f3a82e4891
parent34e0c5a799fcb4265aba4058b6b6162d2f0607f5 (diff)
downloadglib-a4ccb4972cf42e9376c961a5b2c24c28c27e2143.tar.gz
ci: No need to "cd _build" and set prefix/libdir
-rw-r--r--.gitlab-ci.yml10
1 files changed, 4 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1362abc71..0632646a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,13 +17,11 @@ fedora-meson-x86_64:
except:
- tags
variables:
- CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
+ CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
script:
- - meson --prefix /usr --libdir /usr/lib64 --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build .
- - cd _build
- - ninja
- - meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
- - cd ..
+ - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build .
+ - ninja -C _build
+ - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
- mkdir -p _coverage
- lcov --rc lcov_branch_coverage=1 --directory . --capture --no-external --output-file "_coverage/${CI_JOB_NAME}.lcov"
artifacts: