From: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu, 12 Sep 2019 09:38:06 +0000 (+0200)
Subject: gitlab-ci: Test scons with all LLVM versions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=baa5024e2477068ede9141a16cc22d104c79fd9c;p=mesa.git

gitlab-ci: Test scons with all LLVM versions

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 170b2cb1a0d..588293f276d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -342,13 +342,18 @@ scons-llvm:
   variables:
     SCONS_TARGET: "llvm=1"
     SCONS_CHECK_COMMAND: "scons llvm=1 check"
-    LLVM_VERSION: "6.0"
+  script:
+    - LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=7 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=8 .gitlab-ci/scons-build.sh
 
 scons-old-llvm:
   extends: scons-llvm
   image: $STRETCH_IMAGE
-  variables:
-    LLVM_VERSION: "3.9"
+  script:
+    - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
 
 .deqp-test:
   extends: .ci-run-policy