From 3edb399a3aa7af80b467887e131120fb2010feae Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 28 May 2020 14:32:55 +0200
Subject: [PATCH] [CI] Fix caching.
---
scripts/ci/extends/template-build-win.yml | 1 -
scripts/ci/jobs/build-gui-linux.yml | 1 -
scripts/ci/jobs/build-gui-mac.yml | 1 -
scripts/ci/jobs/build-linux.yml | 1 -
scripts/ci/jobs/build-mac.yml | 1 -
scripts/ci/jobs/check-header.yml | 4 ++++
6 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/ci/extends/template-build-win.yml b/scripts/ci/extends/template-build-win.yml
index 8d0b4b68c37..77425784677 100644
--- 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
index e7d334dbd21..c2be3aa672a 100644
--- 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
index 5ef942411a7..4b8d86c3b0d 100644
--- 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
index 0e3f476b4ad..9ae851f572f 100644
--- 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
index 9fb1c555d20..78b12b5fe6a 100644
--- 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
index 35722b153d3..11a0cf80a0b 100644
--- 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
--
GitLab