fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: run the meson script for the VMs as well

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-11-28 13:02:48 +10:00 • committed by Benjamin Tissoires
parent 142399f8a3
commit b8bbf424de
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -491,13 +491,13 @@ freebsd:11.2@container-clean:
- *check_tainted - *check_tainted
- "scp -P 5555 -r $PWD localhost:" - "scp -P 5555 -r $PWD localhost:"
- ssh localhost -p 5555 rm -rf $CI_PROJECT_NAME/"$MESON_BUILDDIR" - echo "CI_JOB_ID=\"$CI_JOB_ID\"" > sshenv
- ssh localhost -p 5555 "cd $CI_PROJECT_NAME ; meson \"$MESON_BUILDDIR\" $MESON_ARGS" - echo "CI_JOB_NAME=\"$CI_JOB_NAME\"" >> sshenv
- ssh localhost -p 5555 "cd $CI_PROJECT_NAME ; meson configure \"$MESON_BUILDDIR\" " - echo "MESON_BUILDDIR=\"$MESON_BUILDDIR\"" >> sshenv
- ssh localhost -p 5555 "cd $CI_PROJECT_NAME ; ninja -C \"$MESON_BUILDDIR\" $NINJA_ARGS" - echo "MESON_TEST_ARGS=\"$MESON_TEST_ARGS $SUITES\"" >> sshenv
- echo "meson test -C \"$MESON_BUILDDIR\" $MESON_TEST_ARGS $SUITES --print-errorlogs" - echo "NINJA_ARGS=\"$NINJA_ARGS\"" >> sshenv
- ssh localhost -p 5555 "cd $CI_PROJECT_NAME ; meson test -C \"$MESON_BUILDDIR\" $MESON_TEST_ARGS --print-errorlogs $SUITES" && touch .success || true - "scp -P 5555 sshenv localhost:~/$CI_PROJECT_NAME/.meson_environment"
- ssh localhost -p 5555 "cd $CI_PROJECT_NAME ; .gitlab-ci/meson-build.sh" && touch .success || true
# no matter the results of the tests, we want to fetch the logs # no matter the results of the tests, we want to fetch the logs
- scp -P 5555 -r localhost:$CI_PROJECT_NAME/$MESON_BUILDDIR . - scp -P 5555 -r localhost:$CI_PROJECT_NAME/$MESON_BUILDDIR .
@ -523,6 +523,8 @@ freebsd:11.2@container-clean:
paths: paths:
- $MESON_BUILDDIR/meson-logs - $MESON_BUILDDIR/meson-logs
- console.out - console.out
reports:
junit: $MESON_BUILDDIR/junit-*.xml
allow_failure: true allow_failure: true
needs: ['fedora:30@qemu-prep'] needs: ['fedora:30@qemu-prep']

6
.gitlab-ci/meson-build.sh
View file

@ -1,5 +1,9 @@
#!/bin/bash #!/bin/bash
if [[ -f .meson_environment ]]; then
. .meson_environment
fi
if [[ -z "$MESON_BUILDDIR" ]]; then if [[ -z "$MESON_BUILDDIR" ]]; then
echo "\$MESON_BUILDDIR undefined." echo "\$MESON_BUILDDIR undefined."
exit 1 exit 1
@ -37,7 +41,7 @@ fi
# we still want to generate the reports, even if meson test fails # we still want to generate the reports, even if meson test fails
set +e set +e
meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS --print-errorlogs
exit_code=$? exit_code=$?
set -e set -e