This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/conan-macos
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/hotfix/conan-macos by this
push:
new c3cf1132 Use Conan2 for mac-build of conan_create.yml.
c3cf1132 is described below
commit c3cf1132e89581357e4de86a8e25fb7f212a5605
Author: PengZheng <[email protected]>
AuthorDate: Fri Nov 3 10:46:32 2023 +0800
Use Conan2 for mac-build of conan_create.yml.
---
.github/workflows/conan_create.yml | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/conan_create.yml
b/.github/workflows/conan_create.yml
index dcfa317c..21d0523c 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -84,20 +84,19 @@ jobs:
- name: Install build dependencies
run: |
brew install python ninja
- pip3 install -U conan==1.61.0
+ pip3 install -U conan
- name: Setup Conan Profile
run: |
- conan profile new default --detect
- conan profile update settings.build_type=Release default
+ conan profile detect -f
- name: Conan Cache
id: cache-conan
uses: actions/cache@v3
env:
- cache-name: cache-conan-modules
+ cache-name: cache-conan2-modules
with:
- path: ${{ env.CONAN_USER_HOME }}
- key: ${{ runner.os }}-builder-${{ env.cache-name }}-${{
hashFiles('conanfile.py') }}
- restore-keys: ${{ runner.os }}-builder-${{ env.cache-name }}-
+ path: ${{ env.CONAN_HOME }}
+ key: ${{ runner.os }}-builder-${{ env.cache-name }}-Release-${{
hashFiles('conanfile.py') }}
+ restore-keys: ${{ runner.os }}-builder-${{ env.cache-name }}-Release-
- name: Prepare ccache timestamp
id: ccache_cache_timestamp
run: |
@@ -111,10 +110,10 @@ jobs:
${{ runner.os }}-ccache-Release-
- name: Create Celix
run: |
- conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b
missing -o celix:build_all=True -o celix:enable_ccache=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
+ conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b
missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default
-pr:h default -s:b build_type=Release -s:h build_type=Release -tf
examples/conan_test_package_v2 -o celix/*:celix_cxx17=True -o
celix/*:celix_install_deprecated_api=True
- name: Dependency Deduction Test
run: |
- conan inspect . -a options | awk 'BEGIN { FS="[\t:]+" } /build/ &&
!/build_all/ { print $1}' | while read option; do conan install . -c
tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix:${option}=True
-pr:b default -pr:h default -if ${option}_dir -o celix:celix_cxx17=True -o
celix:celix_install_deprecated_api=True -o celix:enable_ccache=True
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s
--require-override=zlib/1.2.13 || exit 1; conan build . [...]
+ conan inspect . | awk 'BEGIN { FS="[\t:]+"; output=0 } /build/ &&
!/build_all/ { if(output) print $1} /^options/ {output=1}
/^options_definitions/ {output=0}' | while read option; do conan build . -c
tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:${option}=True
-pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release
-of ${option}_dir -o celix/*:celix_cxx17=True -o celix/*:enable_ccache=True -o
celix/*:celix_install_deprecated_api=True || [...]
- name: Remove Celix
run: |
conan remove -f 'celix/*'
