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 c6bc814a Update macos-build-conan of macos.yml to use Conan2.
c6bc814a is described below
commit c6bc814a98222e635965283766c38a982aa53ea4
Author: PengZheng <[email protected]>
AuthorDate: Fri Nov 3 11:46:49 2023 +0800
Update macos-build-conan of macos.yml to use Conan2.
---
.github/workflows/macos.yml | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 4ba02679..42be8982 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -24,20 +24,19 @@ jobs:
- name: Install conan
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 }}-test-builder-${{ env.cache-name }}-${{
hashFiles('conanfile.py') }}
- restore-keys: ${{ runner.os }}-test-builder-${{ env.cache-name }}-
+ path: ${{ env.CONAN_HOME }}
+ key: ${{ runner.os }}-test-builder-${{ env.cache-name }}-Release-${{
hashFiles('conanfile.py') }}
+ restore-keys: ${{ runner.os }}-test-builder-${{ env.cache-name
}}-Release-
- name: Prepare ccache timestamp
id: ccache_cache_timestamp
run: |
@@ -49,23 +48,19 @@ jobs:
key: ${{ runner.os }}-test-ccache-Release-${{
steps.ccache_cache_timestamp.outputs.timestamp }}
restore-keys: |
${{ runner.os }}-test-ccache-Release-
- - name: Install Dependencies
+ - name: Install Dependencies and Build
env:
CONAN_BUILD_OPTIONS: |
- -o celix:enable_testing=True
- -o celix:enable_address_sanitizer=True
- -o celix:build_all=True
- -o celix:enable_cmake_warning_tests=True
- -o celix:enable_testing_on_ci=True
- -o celix:framework_curlinit=False
- -o celix:enable_ccache=True
+ -o celix/*:enable_testing=True
+ -o celix/*:enable_address_sanitizer=True
+ -o celix/*:build_all=True
+ -o celix/*:enable_cmake_warning_tests=True
+ -o celix/*:enable_testing_on_ci=True
+ -o celix/*:framework_curlinit=False
+ -o celix/*:enable_ccache=True
run: |
#force require libcurl 7.64.1, due to a sha256 verify issue in
libcurl/7.87.0
- conan install . celix/ci -c
tools.cmake.cmaketoolchain:generator=Ninja -pr:b default -pr:h default -if
build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s
- - name: Build
- run: |
- conan build . -bf build
-
+ conan build . celix/ci -c tools.cmake.cmaketoolchain:generator=Ninja
-pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of
build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest
- name: Test
run: |
cd build
