projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0374aac)
gitlab-ci: Test scons with all LLVM versions
authorMichel Dänzer <mdaenzer@redhat.com>
Thu, 12 Sep 2019 09:38:06 +0000 (11:38 +0200)
committerMichel Dänzer <michel@daenzer.net>
Wed, 18 Sep 2019 10:36:48 +0000 (10:36 +0000)
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
.gitlab-ci.yml patch | blob | history

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 170b2cb1a0d19486c588c920b29c6ca1ae5b1a6f..588293f276d3a0036657e069ae45b8f59f88e809 100644 (file)
--- 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"
   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
 
 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
 
 .deqp-test:
   extends: .ci-run-policy