gallivm/s390: fix pass init order on s390 with llvm 8 (v2)

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a194d6c0838a833ed80300b99162b7f4428b3892..ac2648cfa5c16ccb775b26d03fb8295b1beb5781 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,7 +125,7 @@ x86_build:
 x86_test-gl:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-gl "2020-01-14"
+    DEBIAN_TAG: &x86_test-gl "2020-01-30"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -165,7 +165,7 @@ arm_build:
     - .debian@container-ifnot-exists@arm64v8
     - .container
   variables:
-    DEBIAN_TAG: &arm_build "2020-02-03"
+    DEBIAN_TAG: &arm_build "2020-02-05"
 
 .use-arm_build:
   variables:
@@ -178,7 +178,7 @@ arm_build:
 arm_test:
   extends: arm_build
   variables:
-    DEBIAN_TAG: &arm_test "2019-12-18"
+    DEBIAN_TAG: &arm_test "2020-01-30"
 
 .use-arm_test:
   variables:
@@ -322,8 +322,6 @@ meson-main:
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
     BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D I-love-half-baked-turnips=true
   tags:
     - aarch64
 
@@ -470,6 +468,8 @@ meson-i386:
 meson-s390x:
   extends:
     - .meson-cross
+  tags:
+    - gstreamer
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast"
@@ -483,8 +483,9 @@ meson-ppc64el:
     - meson-s390x
   variables:
     CROSS: ppc64el
-    GALLIUM_DRIVERS: "nouveau,swrast,virgl"
+    GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl"
     LLVM_VERSION: "8"
+    VULKAN_DRIVERS: "amd"
 
 meson-mingw32-x86_64:
   extends: .meson-build