[celix] branch feature/614-github-cache-build-deps updated: Fix conan home directory.

[pengzheng]

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 27280bed Fix conan home directory.
27280bed is described below

commit 27280beded1a82ba1815b64b91e73b8f93eeeb3e
Author: PengZheng <howto...@gmail.com>
AuthorDate: Tue Aug 29 18:19:19 2023 +0800

    Fix conan home directory.
---
 .github/workflows/conan_create.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/conan_create.yml 
b/.github/workflows/conan_create.yml
index 815de784..3c02a96e 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -10,6 +10,8 @@ on:
 env:
   CONAN_USER_HOME: "${{ github.workspace }}/release/"
   CONAN_USER_HOME_SHORT: "${{ github.workspace }}/release/short"
+  CONAN_HOME: "${{ github.workspace }}/release/"
+
 
 jobs:
 
@@ -41,7 +43,7 @@ jobs:
         env:
           cache-name: cache-conan2-modules
         with:
-          path: ${{ env.CONAN_USER_HOME }}
+          path: ${{ env.CONAN_HOME }}
           key: ${{ runner.os }}-builder-${{ env.cache-name }}-${{ 
matrix.compiler[0] }}-${{ matrix.type }}-${{ hashFiles('conanfile.py') }}
           restore-keys: ${{ runner.os }}-builder-${{ env.cache-name }}-${{ 
matrix.compiler[0] }}-${{ matrix.type }}-
       - name: Create Celix
@@ -69,14 +71,11 @@ jobs:
         id: cache-conan
         uses: actions/cache@v1
         env:
-          cache-name: cache-conan2-modules
+          cache-name: cache-conan-modules
         with:
           path: ${{ env.CONAN_USER_HOME }}
-          key: ${{ runner.os }}-builder-${{ env.cache-name }}-${{ 
matrix.compiler[0] }}-${{ matrix.type }}-${{ hashFiles('conanfile.py') }}
-          restore-keys: ${{ runner.os }}-builder-${{ env.cache-name }}-${{ 
matrix.compiler[0] }}-${{ matrix.type }}-
+          key: ${{ runner.os }}-builder-${{ env.cache-name }}-${{ 
hashFiles('conanfile.py') }}
+          restore-keys: ${{ runner.os }}-builder-${{ env.cache-name }}-
       - name: Create Celix
-        env:
-          CC: ${{ matrix.compiler[0] }}
-          CXX: ${{ matrix.compiler[1] }}
         run: |
           conan inspect . -a options | awk 'BEGIN { FS="[\t:]+" } /build/ && 
!/build_all/ { print $1}' | while read option; do conan create . -c 
tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix:${option}=True  
-pr:b default -pr:h default -tf examples/conan_test_package -tbf test-build -o 
celix:celix_cxx17=True -o celix:celix_install_deprecated_api=True 
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s 
--require-override=zlib/1.2.13 || exit 1; done