fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-20 13:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: correct some meson builddirs

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-20 16:35:37 +10:00
parent f7ef246635
commit 283dfc07f9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -83,7 +83,7 @@ variables:
artifacts: artifacts:
paths: paths:
- _build/test/test-suite.log - _build/test/test-suite.log
- builddir/meson-logs/testlog*.txt - $MESON_BUILDDIR/meson-logs/
expire_in: 1 week expire_in: 1 week
when: on_failure when: on_failure
reports: reports:
@ -105,10 +105,10 @@ variables:
extends: extends:
- .default_artifacts - .default_artifacts
script: script:
- meson builddir $MESON_ARGS - meson "$MESON_BUILDDIR" $MESON_ARGS
- ninja -C builddir $NINJA_ARGS - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
- if ! [[ -z '$MESON_TEST_ARGS' ]]; then - if ! [[ -z '$MESON_TEST_ARGS' ]]; then
meson test -C builddir $MESON_TEST_ARGS; meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS;
fi fi
################################################################# #################################################################

8
.gitlab-ci/gitlab-ci.tmpl
View file

@ -83,7 +83,7 @@ variables:
artifacts: artifacts:
paths: paths:
- _build/test/test-suite.log - _build/test/test-suite.log
- builddir/meson-logs/testlog*.txt - $MESON_BUILDDIR/meson-logs/
expire_in: 1 week expire_in: 1 week
when: on_failure when: on_failure
reports: reports:
@ -105,10 +105,10 @@ variables:
extends: extends:
- .default_artifacts - .default_artifacts
script: script:
- meson builddir $MESON_ARGS - meson "$MESON_BUILDDIR" $MESON_ARGS
- ninja -C builddir $NINJA_ARGS - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
- if ! [[ -z '$MESON_TEST_ARGS' ]]; then - if ! [[ -z '$MESON_TEST_ARGS' ]]; then
meson test -C builddir $MESON_TEST_ARGS; meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS;
fi fi
################################################################# #################################################################