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:
parent
3d7df9b452
commit
67bca99637
|
@ -76,9 +76,7 @@ debian-bullseye:
|
||||||
meson:
|
meson:
|
||||||
extends: .common-build-and-test
|
extends: .common-build-and-test
|
||||||
script:
|
script:
|
||||||
- meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/
|
- .gitlab-ci/build-and-test.sh
|
||||||
- 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/manpages-check
|
- .gitlab-ci/manpages-check
|
||||||
|
|
||||||
meson-noglamor:
|
meson-noglamor:
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue