From: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu, 12 Sep 2019 09:34:43 +0000 (+0200)
Subject: gitlab-ci: Move scons build/test commands to a separate shell script
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0374aacac0a9f9f4a0255ffcf8bcd1439103bc24;p=mesa.git

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

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