X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=3d0e884bce539da14b52eaf4956411edb8c25abc;hb=0efc253f024db93fd9f20734a5e6d6905c1315ae;hp=588293f276d3a0036657e069ae45b8f59f88e809;hpb=baa5024e2477068ede9141a16cc22d104c79fd9c;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 588293f276d..3d0e884bce5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,11 @@ debian-9:
     DEBIAN_IMAGE: $STRETCH_IMAGE
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh'
 
+.use-debian-9:
+  image: $STRETCH_IMAGE
+  needs:
+    - debian-9
+
 # Builds a Docker image with the native environment and VK-GL-CTS for testing.
 test-container:arm64:
   extends:
@@ -89,6 +94,8 @@ test-container:arm64:
 .build:
   extends: .ci-run-policy
   image: $DEBIAN_IMAGE
+  needs:
+    - debian-10
   stage: build
   cache:
     paths:
@@ -277,8 +284,9 @@ meson-clover:
     - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
 
 meson-clover-old-llvm:
-  extends: meson-clover
-  image: $STRETCH_IMAGE
+  extends:
+    - meson-clover
+    - .use-debian-9
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -331,25 +339,21 @@ meson-i386:
       -D llvm=false
       -D osmesa=classic
 
-scons-nollvm:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: "llvm=0"
-    SCONS_CHECK_COMMAND: "scons llvm=0 check"
-
-scons-llvm:
+scons:
   extends: .scons-build
   variables:
     SCONS_TARGET: "llvm=1"
     SCONS_CHECK_COMMAND: "scons llvm=1 check"
   script:
+    - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .gitlab-ci/scons-build.sh
     - 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
+  extends:
+    - scons
+    - .use-debian-9
   script:
     - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
     - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
@@ -419,7 +423,9 @@ arm64_a630_gles2:
     - mesa-cheza
   dependencies:
     - meson-arm64
-  needs: [ meson-arm64 ]
+  needs:
+    - meson-arm64
+    - test-container:arm64
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2