turnip: Deconflict vk_format_table regeneration

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ac1be258c609ebc7da890820db95fd812e991ea..014e06b29dcb8978fa1a561621b9e4012a458100 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@
 # The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays
 # at "01" unless you have multiple updates on the same day :)
 variables:
-  UBUNTU_TAG: 2019-02-12-01
+  UBUNTU_TAG: 2019-03-05-01
   UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG"
   UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG"
 
@@ -29,9 +29,18 @@ stages:
   - build+test
 
 
+# When to automatically run the CI
+.ci-run-policy:
+  only:
+    - master
+    - merge_requests
+    - /^ci([-/].*)?$/
+
+
 # CONTAINERS
 
-containers:ubuntu:
+ubuntu:
+  extends: .ci-run-policy
   stage: containers-build
   image: docker:stable
   services:
@@ -52,21 +61,14 @@ containers:ubuntu:
       docker image push $UBUNTU_IMAGE && exit || true
     - docker build -t $UBUNTU_IMAGE -f .gitlab-ci/Dockerfile.ubuntu .
     - docker push $UBUNTU_IMAGE
-  only:
-    changes:
-      - .gitlab-ci.yml
-      - .gitlab-ci/Dockerfile.ubuntu
 
 
 # BUILD
 
 .build:
+  extends: .ci-run-policy
   image: $UBUNTU_IMAGE
   stage: build+test
-  only:
-    - master
-    - merge_requests
-    - /^ci([-/].*)?$/
   artifacts:
     when: on_failure
     untracked: true
@@ -143,7 +145,7 @@ containers:ubuntu:
     - scons $SCONS_TARGET
     - eval $SCONS_CHECK_COMMAND
 
-build:meson-vulkan:
+meson-vulkan:
   extends: .meson-build
   variables:
     UNWIND: "false"
@@ -165,7 +167,7 @@ build:meson-vulkan:
     VULKAN_DRIVERS: intel,amd
     LLVM_VERSION: "7"
 
-build:meson-loader-classic-dri:
+meson-loader-classic-dri:
   extends: .meson-build
   variables:
     UNWIND: "false"
@@ -186,7 +188,7 @@ build:meson-loader-classic-dri:
       -D gallium-nine=false
       -D gallium-opencl=disabled
 
-build:meson-glvnd:
+meson-glvnd:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -208,7 +210,7 @@ build:meson-glvnd:
 # NOTE: Building SWR is 2x (yes two) times slower than all the other
 # gallium drivers combined.
 # Start this early so that it doesn't hunder the run time.
-build:meson-gallium-swr:
+meson-gallium-swr:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -228,7 +230,7 @@ build:meson-gallium-swr:
     GALLIUM_DRIVERS: "swr"
     LLVM_VERSION: "6.0"
 
-build:meson-gallium-radeonsi:
+meson-gallium-radeonsi:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -248,7 +250,7 @@ build:meson-gallium-radeonsi:
     GALLIUM_DRIVERS: "radeonsi"
     LLVM_VERSION: "7"
 
-build:meson-gallium-drivers-other:
+meson-gallium-drivers-other:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -265,10 +267,10 @@ build:meson-gallium-drivers-other:
       -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"
+    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost"
     LLVM_VERSION: "5.0"
 
-build:meson-gallium-clover-llvm5:
+meson-gallium-clover-llvm:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -285,21 +287,15 @@ build:meson-gallium-clover-llvm5:
       -D gallium-xa=false
       -D gallium-nine=false
       -D gallium-opencl=icd
-    GALLIUM_DRIVERS: "r600"
-    LLVM_VERSION: "5.0"
-
-build:meson-gallium-clover-llvm6:
-  extends: build:meson-gallium-clover-llvm5
-  variables:
-    LLVM_VERSION: "6.0"
+    GALLIUM_DRIVERS: "r600,radeonsi"
 
-build:meson-gallium-clover-llvm7:
-  extends: build:meson-gallium-clover-llvm5
+meson-gallium-clover-llvm39:
+  extends: meson-gallium-clover-llvm
   variables:
-    GALLIUM_DRIVERS: "r600,radeonsi"
-    LLVM_VERSION: "7"
+    GALLIUM_DRIVERS: "r600"
+    LLVM_VERSION: "3.9"
 
-build:meson-gallium-st-other:
+meson-gallium-st-other:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -320,7 +316,7 @@ build:meson-gallium-st-other:
     GALLIUM_DRIVERS: "nouveau,swrast"
     LLVM_VERSION: "5.0"
 
-build:make-vulkan:
+make-vulkan:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "make -C src/gtest check && make -C src/intel check"
@@ -345,7 +341,7 @@ build:make-vulkan:
     VULKAN_DRIVERS: intel,radeon
     LIBUNWIND_FLAGS: --disable-libunwind
 
-build:make-loader-classic-dri:
+make-loader-classic-dri:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "make check"
@@ -371,7 +367,7 @@ build:make-loader-classic-dri:
 # NOTE: Building SWR is 2x (yes two) times slower than all the other
 # gallium drivers combined.
 # Start this early so that it doesn't hunder the run time.
-build:make-gallium-drivers-swr:
+make-gallium-drivers-swr:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "true"
@@ -393,23 +389,22 @@ build:make-gallium-drivers-swr:
     GALLIUM_DRIVERS: "swr"
     LIBUNWIND_FLAGS: --enable-libunwind
 
-build:make-gallium-drivers-radeonsi:
-  extends: build:make-gallium-drivers-swr
+make-gallium-drivers-radeonsi:
+  extends: make-gallium-drivers-swr
   variables:
     LLVM_VERSION: "7"
     GALLIUM_DRIVERS: "radeonsi"
 
-build:make-gallium-drivers-other:
-  extends: build:make-gallium-drivers-swr
+make-gallium-drivers-other:
+  extends: make-gallium-drivers-swr
   variables:
     LLVM_VERSION: "3.9"
     GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
 
-build:make-gallium-st-clover-llvm-39:
+make-gallium-st-clover-llvm:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "true"
-    LLVM_VERSION: "3.9"
     DRI_LOADERS: >
       --disable-glx
       --disable-gbm
@@ -426,31 +421,17 @@ build:make-gallium-st-clover-llvm-39:
       --disable-va
       --disable-omx-bellagio
       --disable-gallium-osmesa
-    GALLIUM_DRIVERS: "r600"
     LIBUNWIND_FLAGS: --enable-libunwind
+    GALLIUM_DRIVERS: "r600,radeonsi"
+    LLVM_VERSION: "7"
 
-build:make-gallium-st-clover-llvm-4:
-  extends: build:make-gallium-st-clover-llvm-39
-  variables:
-    LLVM_VERSION: "4.0"
-
-build:make-gallium-st-clover-llvm-5:
-  extends: build:make-gallium-st-clover-llvm-39
-  variables:
-    LLVM_VERSION: "5.0"
-
-build:make-gallium-st-clover-llvm-6:
-  extends: build:make-gallium-st-clover-llvm-39
-  variables:
-    LLVM_VERSION: "6.0"
-
-build:make-gallium-st-clover-llvm-7:
-  extends: build:make-gallium-st-clover-llvm-39
+make-gallium-st-clover-llvm-39:
+  extends: make-gallium-st-clover-llvm
   variables:
-    LLVM_VERSION: "7"
-    GALLIUM_DRIVERS: "r600,radeonsi"
+    LLVM_VERSION: "3.9"
+    GALLIUM_DRIVERS: "r600"
 
-build:make-gallium-st-other:
+make-gallium-st-other:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "true"
@@ -476,20 +457,20 @@ build:make-gallium-st-other:
     GALLIUM_DRIVERS: "i915,swrast"
     LIBUNWIND_FLAGS: --enable-libunwind
 
-build:scons-nollvm:
+scons-nollvm:
   extends: .scons-build
   variables:
     SCONS_TARGET: "llvm=0"
     SCONS_CHECK_COMMAND: "scons llvm=0 check"
 
-build:scons-llvm:
+scons-llvm:
   extends: .scons-build
   variables:
     SCONS_TARGET: "llvm=1"
     SCONS_CHECK_COMMAND: "scons llvm=1 check"
     LLVM_VERSION: "3.9"
 
-build:scons-swr:
+scons-swr:
   extends: .scons-build
   variables:
     SCONS_TARGET: "swr=1"