ci: Move build job script to a separate file

Will make it easier to do more complex shell stuff.

No functional change intended.

v2:
* Use /bin/bash instead of /bin/sh (Peter Hutterer)
* Export environment variables on a separate line (Peter)
* Use "set" command instead of shell command line arguments, for
  consistency with debian-install.sh.
This commit is contained in:
Michel Dänzer 2022-09-02 11:13:20 +02:00 committed by Michel Dänzer
parent 3d7df9b452
commit 67bca99637
2 changed files with 12 additions and 3 deletions

View File

@ -76,9 +76,7 @@ debian-bullseye:
meson:
extends: .common-build-and-test
script:
- meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/
- ninja -j${FDO_CI_CONCURRENT:-4} -C build/ dist
- PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts ninja -j${FDO_CI_CONCURRENT:-4} -C build/ test
- .gitlab-ci/build-and-test.sh
- .gitlab-ci/manpages-check
meson-noglamor:

11
.gitlab-ci/build-and-test.sh Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
set -e
set -o xtrace
meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/
ninja -j${FDO_CI_CONCURRENT:-4} -C build/ dist
export PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts
ninja -j${FDO_CI_CONCURRENT:-4} -C build/ test