X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=6a5dde86ed357376a69e5306afd10a0aa275177d;hb=a72cdd00abd5f3c18df01acc60bf3b385facfdb6;hp=98dc3fcc703315c090eb0e60c6708e9f2fd67c3c;hpb=553cd82d64c25f5d790a48e082c47b1d523ecfd2;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98dc3fcc703..6a5dde86ed3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,6 +111,35 @@ debian:
     - scons $SCONS_TARGET
     - eval $SCONS_CHECK_COMMAND
 
+meson-main:
+  extends: .meson-build
+  variables:
+    UNWIND: "true"
+    DRI_LOADERS: >
+      -D glx=dri
+      -D gbm=true
+      -D egl=true
+      -D platforms=x11,wayland,drm,surfaceless
+    DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
+    GALLIUM_ST: >
+      -D dri3=true
+      -D gallium-extra-hud=true
+      -D gallium-vdpau=true
+      -D gallium-xvmc=true
+      -D gallium-omx=bellagio
+      -D gallium-va=true
+      -D gallium-xa=true
+      -D gallium-nine=true
+      -D gallium-opencl=disabled
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
+    LLVM_VERSION: "7"
+    EXTRA_OPTION: >
+      -D osmesa=gallium
+      -D tools=all
+    MESON_SHADERDB: "true"
+    BUILDTYPE: "debugoptimized"
+  <<: *ci-deqp-artifacts
+
 # NOTE: Building SWR is 2x (yes two) times slower than all the other
 # gallium drivers combined.
 # Start this early so that it doesn't limit the total run time.
@@ -164,35 +193,6 @@ scons-win64:
     SCONS_TARGET: platform=windows machine=x86_64
     SCONS_CHECK_COMMAND: "true"
 
-meson-main:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=true
-      -D egl=true
-      -D platforms=x11,wayland,drm,surfaceless
-    DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
-    GALLIUM_ST: >
-      -D dri3=true
-      -D gallium-extra-hud=true
-      -D gallium-vdpau=true
-      -D gallium-xvmc=true
-      -D gallium-omx=bellagio
-      -D gallium-va=true
-      -D gallium-xa=true
-      -D gallium-nine=true
-      -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
-    LLVM_VERSION: "7"
-    EXTRA_OPTION: >
-      -D osmesa=gallium
-      -D tools=all
-    MESON_SHADERDB: "true"
-    BUILDTYPE: "debugoptimized"
-  <<: *ci-deqp-artifacts
-
 meson-clover:
   extends: .meson-build
   variables:
@@ -213,12 +213,13 @@ meson-clover:
   script:
     - export GALLIUM_DRIVERS="r600,radeonsi"
     - .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
+    - LLVM_VERSION=8 .gitlab-ci/meson-build.sh
     - export GALLIUM_DRIVERS="i915,r600"
     - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh
     - LLVM_VERSION=4.0 .gitlab-ci/meson-build.sh
     - LLVM_VERSION=5.0 .gitlab-ci/meson-build.sh
     - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh
+    - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
 
 meson-vulkan:
   extends: .meson-build
@@ -240,7 +241,7 @@ meson-vulkan:
       -D gallium-nine=false
       -D gallium-opencl=disabled
     VULKAN_DRIVERS: intel,amd,freedreno
-    LLVM_VERSION: "7"
+    LLVM_VERSION: "8"
     EXTRA_OPTION: >
       -D vulkan-overlay-layer=true
 
@@ -352,6 +353,7 @@ test-llvmpipe-gles2:
   extends: .deqp-test
   dependencies:
     - meson-main
+  needs: [meson-main]
 
 test-softpipe-gles2:
   parallel: 4
@@ -364,6 +366,7 @@ test-softpipe-gles2:
   extends: .deqp-test
   dependencies:
     - meson-main
+  needs: [meson-main]
 
 # The GLES2 CTS run takes about 8 minutes of CPU time, while GLES3 is
 # 25 minutes.  Until we can get its runtime down, just do a partial
@@ -380,3 +383,4 @@ test-softpipe-gles3-limited:
   extends: .deqp-test
   dependencies:
     - meson-main
+  needs: [meson-main]