summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2020-02-20 16:35:37 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2020-02-20 17:06:14 +1000
commit283dfc07f98d697ffba9bacfb6ff95b0feb62e51 (patch)
treeb48117e14a5ac5cbe70ca91048d8b39aa7281fed /.gitlab-ci.yml
parentf7ef246635500afc3b47e0d86bee015fefcd4d72 (diff)
downloadlibevdev-283dfc07f98d697ffba9bacfb6ff95b0feb62e51.tar.gz
gitlab CI: correct some meson builddirs
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81d072b..d52966e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,7 +83,7 @@ variables:
artifacts:
paths:
- _build/test/test-suite.log
- - builddir/meson-logs/testlog*.txt
+ - $MESON_BUILDDIR/meson-logs/
expire_in: 1 week
when: on_failure
reports:
@@ -105,10 +105,10 @@ variables:
extends:
- .default_artifacts
script:
- - meson builddir $MESON_ARGS
- - ninja -C builddir $NINJA_ARGS
+ - meson "$MESON_BUILDDIR" $MESON_ARGS
+ - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
- if ! [[ -z '$MESON_TEST_ARGS' ]]; then
- meson test -C builddir $MESON_TEST_ARGS;
+ meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS;
fi
#################################################################