docs: spell out "and" in sidebar

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f336cbb0b9a519cfa76d3120e9cbb4e3f2375a5e..734d1f9e936c71978e3140f0622105e45e714d64 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@
 # at "01" unless you have multiple updates on the same day :)
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-04-16"
+  DEBIAN_TAG: "2019-05-01"
   DEBIAN_VERSION: stretch-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
@@ -122,24 +122,31 @@ debian:
 # 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.
-meson-gallium-swr:
+#
+# We also put softpipe (and therefore gallium nine, which requires
+# it) here, since softpipe/llvmpipe can't be built alongside classic
+# swrast.
+#
+# Putting glvnd here is arbitrary, but we want it in one of the builds
+# for coverage.
+meson-swr-glvnd:
   extends: .meson-build
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=false
-      -D gbm=false
+      -D glvnd=true
+      -D egl=true
     GALLIUM_ST: >
-      -D dri3=false
+      -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-nine=true
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "swr"
+      -D osmesa=gallium
+    GALLIUM_DRIVERS: "swr,swrast,iris"
     LLVM_VERSION: "6.0"
 
 meson-clang:
@@ -179,10 +186,10 @@ meson-vulkan:
     VULKAN_DRIVERS: intel,amd,freedreno
     LLVM_VERSION: "7"
 
-meson-loader-classic-dri:
+meson-main:
   extends: .meson-build
   variables:
-    UNWIND: "false"
+    UNWIND: "true"
     DRI_LOADERS: >
       -D glx=dri
       -D gbm=true
@@ -192,74 +199,18 @@ meson-loader-classic-dri:
     DRI_DRIVERS: "i915,i965,r100,r200,swrast,nouveau"
     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
-
-meson-glvnd:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glvnd=true
-      -D egl=true
-      -D gbm=true
-      -D glx=dri
-    DRI_DRIVERS: "i965"
-    GALLIUM_ST: >
-      -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
-
-meson-gallium-radeonsi:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=false
-      -D gbm=false
-    GALLIUM_ST: >
-      -D dri3=false
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
+      -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=false
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "radeonsi"
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
     LLVM_VERSION: "7"
 
-meson-gallium-drivers-other:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=false
-      -D gbm=false
-    GALLIUM_ST: >
-      -D dri3=false
-      -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
-    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima"
-    LLVM_VERSION: "5.0"
-
-meson-gallium-clover-llvm:
+meson-clover-llvm:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -278,34 +229,12 @@ meson-gallium-clover-llvm:
       -D gallium-opencl=icd
     GALLIUM_DRIVERS: "r600,radeonsi"
 
-meson-gallium-clover-llvm39:
-  extends: meson-gallium-clover-llvm
+meson-clover-llvm39:
+  extends: meson-clover-llvm
   variables:
-    GALLIUM_DRIVERS: "r600"
+    GALLIUM_DRIVERS: "i915,r600"
     LLVM_VERSION: "3.9"
 
-meson-gallium-st-other:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=false
-      -D gbm=false
-    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
-      -D osmesa=gallium
-    GALLIUM_DRIVERS: "nouveau,swrast"
-    LLVM_VERSION: "5.0"
-
 scons-nollvm:
   extends: .scons-build
   variables:
@@ -327,3 +256,9 @@ scons-swr:
     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"