X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=80b4b012c464288b884b144cd5b3b71a37869b60;hb=ff71fae4403269c6ecd99cf15fa03a7a54355626;hp=9c0612a90b6604ec9e92ac96309bafdfdfd3134a;hpb=7362176cfe47bc372caca1e90c85bb8758f42687;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c0612a90b6..80b4b012c46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,22 +166,16 @@ arm_test:
 # Just Linux
 .build-linux:
   extends: .build-common
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - ccache
   variables:
     CCACHE_COMPILERCHECK: "content"
+    CCACHE_COMPRESS: "true"
+    CCACHE_DIR: /cache/mesa/ccache
   # Use ccache transparently, and print stats before/after
   before_script:
     - 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
+    - ccache --show-stats
   after_script:
-    - export CCACHE_DIR="$PWD/ccache"
     - ccache --show-stats
 
 .build-windows:
@@ -307,30 +301,6 @@ meson-arm64:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
-# 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.
-#
-# We also stick the glvnd build here, since we want non-glvnd in
-# meson-main for actual driver CI.
-meson-swr-glvnd:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D egl=true
-    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
-    GALLIUM_DRIVERS: "iris"
-    LLVM_VERSION: "6.0"
-
 meson-clang:
   extends: .meson-build
   variables:
@@ -588,6 +558,7 @@ arm64_a630_gles2:
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
     DEQP_SKIPS: deqp-freedreno-a630-skips.txt
     NIR_VALIDATE: 0
+    DEQP_PARALLEL: 4
   tags:
     - mesa-cheza
   dependencies:
@@ -595,18 +566,15 @@ arm64_a630_gles2:
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2
-  parallel: 4
   variables:
     DEQP_VER: gles31
 
 arm64_a630_gles3:
-  parallel: 6
   extends: arm64_a630_gles2
   variables:
     DEQP_VER: gles3
 
 arm64_a306_gles2:
-  parallel: 4
   extends: arm64_a630_gles2
   variables:
     DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt