[CI] Fix caching.

ufz · May 28, 2020 · 875efa5 · 875efa5
1 parent 8d2f998
commit 875efa5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/scripts/ci/extends/template-build-win.yml b/scripts/ci/extends/template-build-win.yml
@@ -8,7 +8,6 @@
     - .test-artifacts
 
   variables:
-    CCACHE_DIR: "$CI_PROJECT_DIR/.ccache"
 
   script:
     - mkdir -p $BUILD_DIR

diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
@@ -13,7 +13,6 @@ build gui linux:
 
   variables:
     BUILD_DIR: "build-gui-linux"
-    CCACHE_DIR: "$CI_PROJECT_DIR/.ccache"
     CMAKE_ARGS: >-
       -DOGS_USE_CONAN=ON
       -DOGS_USE_PCH=OFF

diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
@@ -15,7 +15,6 @@ build gui mac:
 
   variables:
     BUILD_DIR: "build-gui-mac"
-    CCACHE_DIR: "$CI_PROJECT_DIR/.ccache"
     CMAKE_ARGS: >-
       -DOGS_USE_CONAN=OFF
       -DOGS_USE_PCH=OFF

diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml
@@ -3,7 +3,6 @@ build linux:
 
   variables:
     BUILD_DIR: "build"
-    CCACHE_DIR: "$CI_PROJECT_DIR/.ccache"
     CMAKE_ARGS: "-DOGS_USE_CONAN=OFF"
 
   image:

diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml
@@ -6,4 +6,3 @@ build mac:
 
   variables:
     BUILD_DIR: "build-mac"
-    CCACHE_DIR: "$CI_PROJECT_DIR/.ccache"
diff --git a/scripts/ci/jobs/check-header.yml b/scripts/ci/jobs/check-header.yml
@@ -23,3 +23,7 @@ check header:
       -DCMAKE_BUILD_TYPE=$BUILD_TYPE
       -DOGS_BUILD_PROCESSES=$BUILD_PROCESSES
     - cat CMakeFiles/CMakeError.log || true
+
+  cache:
+    paths:
+      - $CCACHE_DIR