This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/614-github-cache-build-deps
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to 
refs/heads/feature/614-github-cache-build-deps by this push:
     new f9c594bc Use ccache 4.6.
f9c594bc is described below

commit f9c594bce55691b176e399c1843fbee78c5c91cf
Author: PengZheng <[email protected]>
AuthorDate: Wed Aug 30 17:58:52 2023 +0800

    Use ccache 4.6.
---
 .github/workflows/conan_create.yml | 1 +
 conanfile.py                       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/conan_create.yml 
b/.github/workflows/conan_create.yml
index 8ab94aec..8bc48720 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -13,6 +13,7 @@ env:
   CONAN_HOME: "${{ github.workspace }}/release/"
   CCACHE_NOHASHDIR: true
   CCACHE_DIR: "${{ github.workspace }}/.ccache"
+  CCACHE_SLOPPINESS: "include_file_ctime,include_file_mtime"
 
 
 jobs:
diff --git a/conanfile.py b/conanfile.py
index 76ff527b..a1b5b72e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -151,13 +151,14 @@ class CelixConan(ConanFile):
         del self.info.options.enable_testing_for_cxx14
         del self.info.options.enable_cmake_warning_tests
         del self.info.options.enable_testing_on_ci
+        del self.options.enable_ccache
 
     def build_requirements(self):
         if self.options.enable_testing:
             self.test_requires("gtest/1.10.0")
             self.test_requires("cpputest/4.0")
         if self.options.enable_ccache:
-            self.build_requires("ccache/4.8.2")
+            self.build_requires("ccache/4.6")
 
     def configure(self):
         # copy options to options, fill in defaults if not set

Reply via email to