diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2019-09-12 11:34:43 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-09-18 10:36:48 +0000 |
| commit | 0374aacac0a9f9f4a0255ffcf8bcd1439103bc24 (patch) | |
| tree | 8dbf403d10238ef05f8f8f71838f5717777dcad2 | |
| parent | 8a8388ca67979a35bcbf976b11ca0efe1471ae3a (diff) | |
gitlab-ci: Move scons build/test commands to a separate shell script
Preparatory, no functional change intended.
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | .gitlab-ci/scons-build.sh | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bada20dc89c..170b2cb1a0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,11 +129,7 @@ test-container:arm64: variables: SCONSFLAGS: "-j4" script: - - if test -n "$LLVM_VERSION"; then - export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; - fi - - scons $SCONS_TARGET - - eval $SCONS_CHECK_COMMAND + - .gitlab-ci/scons-build.sh meson-main: extends: diff --git a/.gitlab-ci/scons-build.sh b/.gitlab-ci/scons-build.sh new file mode 100755 index 00000000000..30e93c2bb38 --- /dev/null +++ b/.gitlab-ci/scons-build.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e +set -o xtrace + +if test -n "$LLVM_VERSION"; then + export LLVM_CONFIG="llvm-config-${LLVM_VERSION}" +fi + +rm -rf build +scons $SCONS_TARGET +eval $SCONS_CHECK_COMMAND |