Mesa (master): ci: Make lava inherit the ccache setup of the .build script.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: da6cc7223737e407645c7a3a526ec35e408bd6cf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=da6cc7223737e407645c7a3a526ec35e408bd6cf

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Oct 28 15:21:44 2019 -0700

ci: Make lava inherit the ccache setup of the .build script.

It was just duplicating the code.

Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

---

 .gitlab-ci/lava-gitlab-ci.yml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 8305a4da4bd..89e798a4b0a 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -61,18 +61,10 @@ lava-container:arm64:
   image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:$DEBIAN_ARCH-$LAVA_IMAGE_TAG
   extends:
     - .build-linux
-  # Use ccache transparently, and print stats before/after
-  before_script:
-    - mkdir -p results mesa-build
-    - mkdir -p ccache
-    - 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
   script:
     # Build Mesa
+    - mkdir -p results mesa-build
+    - mkdir -p ccache
     - /usr/share/meson/debcrossgen --arch ${DEBIAN_ARCH} -o /tmp/cross_file.txt
     - meson . mesa-build
         --cross-file /tmp/cross_file.txt
@@ -120,9 +112,6 @@ lava-container:arm64:
         --base-artifacts-url $CI_PROJECT_URL/-/jobs/$CI_JOB_ID/artifacts/raw/results
         --device-types ${DEVICE_TYPES}
         --kernel-image-name ${KERNEL_IMAGE_NAME}
-  after_script:
-    - export CCACHE_DIR="$PWD/ccache"
-    - ccache --show-stats
   artifacts:
     when: always
     paths: