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>
This commit is contained in:
Michel Dänzer
2019-09-12 11:34:43 +02:00
committed by Michel Dänzer
parent 8a8388ca67
commit 0374aacac0
2 changed files with 13 additions and 5 deletions

View File

@@ -129,11 +129,7 @@ test-container:arm64:
variables: variables:
SCONSFLAGS: "-j4" SCONSFLAGS: "-j4"
script: script:
- if test -n "$LLVM_VERSION"; then - .gitlab-ci/scons-build.sh
export LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
fi
- scons $SCONS_TARGET
- eval $SCONS_CHECK_COMMAND
meson-main: meson-main:
extends: extends:

12
.gitlab-ci/scons-build.sh Executable file
View File

@@ -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