X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=ee611fd3982234c84a430ca16b7057cb3314c9cf;hb=2e14749f8f82cba47ff89432cafd9fd9bee70e82;hp=170b2cb1a0d19486c588c920b29c6ca1ae5b1a6f;hpb=0374aacac0a9f9f4a0255ffcf8bcd1439103bc24;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 170b2cb1a0d..ee611fd3982 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-09-18"
+  DEBIAN_TAG: "2019-10-16"
   DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
   STRETCH_TAG: "2019-09-18"
   DEBIAN_VERSION: buster-slim
@@ -28,8 +28,11 @@ include:
     ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
     file: '/templates/debian.yml'
 
+include:
+  - local: '/.gitlab-ci/lava-gitlab-ci.yml'
+
 stages:
-  - containers
+  - container
   - build
   - test
 
@@ -56,15 +59,26 @@ stages:
 
 # Build the normal CI native and cross-build docker images.
 
+.container:
+  stage: container
+  extends:
+    - .ci-run-policy
+  variables:
+    # no need to pull the whole repo to build the container image
+    GIT_STRATEGY: none
+
 debian-10:
   extends:
     - .debian@container-ifnot-exists
-    - .ci-run-policy
-  stage: containers
+    - .container
   variables:
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
 
+.use-debian-10:
+  image: $DEBIAN_IMAGE
+  needs:
+    - debian-10
+
 debian-9:
   extends: debian-10
   variables:
@@ -73,24 +87,28 @@ debian-9:
     DEBIAN_IMAGE: $STRETCH_IMAGE
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh'
 
+.use-debian-9:
+  image: $STRETCH_IMAGE
+  needs:
+    - debian-9
+
 # Builds a Docker image with the native environment and VK-GL-CTS for testing.
 test-container:arm64:
   extends:
     - .debian@container-ifnot-exists@arm64v8
-    - .ci-run-policy
-  stage: containers
+    - .container
   variables:
     DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh'
 
+
 # BUILD
 
 .build:
   extends: .ci-run-policy
-  image: $DEBIAN_IMAGE
   stage: build
   cache:
+    key: ${CI_JOB_NAME}
     paths:
       - ccache
   artifacts:
@@ -107,6 +125,7 @@ test-container:arm64:
     - export PATH="/usr/lib/ccache:$PATH"
     - export CCACHE_BASEDIR="$PWD"
     - export CCACHE_DIR="$PWD/ccache"
+    - ccache --max-size=1500M
     - ccache --zero-stats || true
     - ccache --show-stats || true
   after_script:
@@ -120,12 +139,16 @@ test-container:arm64:
     - ccache --show-stats
 
 .meson-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10
   script:
     - .gitlab-ci/meson-build.sh
 
 .scons-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10
   variables:
     SCONSFLAGS: "-j4"
   script:
@@ -182,8 +205,6 @@ meson-main:
       -D gallium-xa=false
       -D gallium-nine=false
       -D llvm=false
-  script:
-    - .gitlab-ci/meson-build.sh
 
 meson-armhf:
   extends: .meson-cross
@@ -277,8 +298,9 @@ meson-clover:
     - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
 
 meson-clover-old-llvm:
-  extends: meson-clover
-  image: $STRETCH_IMAGE
+  extends:
+    - meson-clover
+    - .use-debian-9
   variables:
     UNWIND: "false"
     DRI_LOADERS: >
@@ -331,31 +353,48 @@ meson-i386:
       -D llvm=false
       -D osmesa=classic
 
-scons-nollvm:
-  extends: .scons-build
+meson-mingw32-x86_64:
+  extends: .meson-build
   variables:
-    SCONS_TARGET: "llvm=0"
-    SCONS_CHECK_COMMAND: "scons llvm=0 check"
+    UNWIND: "false"
+    DRI_DRIVERS: ""
+    GALLIUM_DRIVERS: "swrast"
+    EXTRA_OPTION: >
+      -Dllvm=false
+      -Dosmesa=gallium
+      --cross-file=.gitlab-ci/x86_64-w64-mingw32
 
-scons-llvm:
+scons:
   extends: .scons-build
   variables:
     SCONS_TARGET: "llvm=1"
     SCONS_CHECK_COMMAND: "scons llvm=1 check"
-    LLVM_VERSION: "6.0"
+  script:
+    - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=7 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=8 .gitlab-ci/scons-build.sh
 
 scons-old-llvm:
-  extends: scons-llvm
-  image: $STRETCH_IMAGE
-  variables:
-    LLVM_VERSION: "3.9"
+  extends:
+    - scons
+    - .use-debian-9
+  script:
+    - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
+    - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
 
-.deqp-test:
+.test:
   extends: .ci-run-policy
   stage: test
-  image: $DEBIAN_IMAGE
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
+
+.deqp-test:
+  extends:
+    - .test
+    - .use-debian-10
+  variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
@@ -414,7 +453,9 @@ arm64_a630_gles2:
     - mesa-cheza
   dependencies:
     - meson-arm64
-  needs: [ meson-arm64 ]
+  needs:
+    - meson-arm64
+    - test-container:arm64
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2