X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=b0e743a3f84cc053d0c25114eef3e0f1d8bd8397;hb=aa5bc35f31863fd15219849bc09826fe5be3a2ba;hp=1b448b34599897f1478695d50d80a165267cd5f3;hpb=cc2b3a99ccf035a084d768e5c5ffa81478d685c1;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b448b34599..b0e743a3f84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-05-01"
+  DEBIAN_TAG: "2019-05-08"
   DEBIAN_VERSION: stretch-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
@@ -137,27 +137,18 @@ meson-clang:
      # clang++ breaks if it picks up the GCC 8 directory without libstdc++.so
     - apt-get remove -y libgcc-8-dev
 
-meson-vulkan:
-  extends: .meson-build
+scons-swr:
+  extends: .scons-build
   variables:
-    UNWIND: "false"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=false
-      -D egl=false
-      -D platforms=x11,wayland,drm
-      -D osmesa=none
-    GALLIUM_ST: >
-      -D dri3=true
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=disabled
-    VULKAN_DRIVERS: intel,amd,freedreno
-    LLVM_VERSION: "7"
+    SCONS_TARGET: "swr=1"
+    SCONS_CHECK_COMMAND: "true"
+    LLVM_VERSION: "6.0"
+
+scons-win64:
+  extends: .scons-build
+  variables:
+    SCONS_TARGET: platform=windows machine=x86_64
+    SCONS_CHECK_COMMAND: "true"
 
 meson-main:
   extends: .meson-build
@@ -182,8 +173,10 @@ meson-main:
       -D gallium-opencl=disabled
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
     LLVM_VERSION: "7"
+    EXTRA_OPTION: >
+      -D tools=all
 
-meson-clover-llvm:
+meson-clover:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -200,13 +193,39 @@ meson-clover-llvm:
       -D gallium-xa=false
       -D gallium-nine=false
       -D gallium-opencl=icd
-    GALLIUM_DRIVERS: "r600,radeonsi"
+  script:
+    - export GALLIUM_DRIVERS="r600,radeonsi"
+    - .gitlab-ci/meson-build.sh
+    - LLVM_VERSION=7 .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
 
-meson-clover-llvm39:
-  extends: meson-clover-llvm
+meson-vulkan:
+  extends: .meson-build
   variables:
-    GALLIUM_DRIVERS: "i915,r600"
-    LLVM_VERSION: "3.9"
+    UNWIND: "false"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D gbm=false
+      -D egl=false
+      -D platforms=x11,wayland,drm
+      -D osmesa=none
+    GALLIUM_ST: >
+      -D dri3=true
+      -D gallium-vdpau=false
+      -D gallium-xvmc=false
+      -D gallium-omx=disabled
+      -D gallium-va=false
+      -D gallium-xa=false
+      -D gallium-nine=false
+      -D gallium-opencl=disabled
+    VULKAN_DRIVERS: intel,amd,freedreno
+    LLVM_VERSION: "7"
+    EXTRA_OPTION: >
+      -D vulkan-overlay-layer=true
 
 scons-nollvm:
   extends: .scons-build
@@ -222,16 +241,3 @@ scons-llvm:
     LLVM_VERSION: "3.4"
     # LLVM 3.4 packages were built with an old libstdc++ ABI
     CXX: "g++ -D_GLIBCXX_USE_CXX11_ABI=0"
-
-scons-swr:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: "swr=1"
-    SCONS_CHECK_COMMAND: "true"
-    LLVM_VERSION: "6.0"
-
-scons-win64:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: platform=windows machine=x86_64
-    SCONS_CHECK_COMMAND: "true"