From: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon, 4 Nov 2019 11:30:12 +0000 (+0100)
Subject: gitlab-ci: Set arm job CCACHE_DIR properly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d80dece0653e6118993f868bdb442592f3a3d584;p=mesa.git

gitlab-ci: Set arm job CCACHE_DIR properly

$PWD doesn't work for variables:, it ended up as "/ccache", always
starting with an empty cache.

v2:
* Use relative path and realpath
v3:
* Use $CI_PROJECT_DIR (Eric Anholt)
* Clear ccache stats in before_script if the cache is in $CI_PROJECT_DIR

Fixes: c9df92bf795a "ci: Switch over to an autoscaling GKE cluster for
                     builds."
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbc38ff156d..0c1a59ba334 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -159,6 +159,7 @@ debian-10:arm64:
     - export PATH="/usr/lib/ccache:$PATH"
     - export CCACHE_BASEDIR="$PWD"
     - ccache --max-size="$CCACHE_SIZE" || true
+    - if [ "$CCACHE_DIR" = "$CI_PROJECT_DIR/ccache" ]; then ccache --zero-stats; fi
     - ccache --show-stats || true
   after_script:
     # In case the install dir is being saved as artifacts, tar it up
@@ -253,7 +254,7 @@ meson-main:
     EXTRA_OPTION: >
       -D I-love-half-baked-turnips=true
     NINJA_FLAGS: "-j4"
-    CCACHE_DIR: "$PWD/ccache"
+    CCACHE_DIR: "$CI_PROJECT_DIR/ccache"
     CCACHE_SIZE: "1500M"
   needs:
     - debian-10:arm64