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 456ae02f Fix `conan build` in macos.yml.
456ae02f is described below
commit 456ae02f5560580b3c2397b6576ce5d6432d7373
Author: PengZheng <[email protected]>
AuthorDate: Fri Nov 3 11:50:22 2023 +0800
Fix `conan build` in macos.yml.
---
.github/workflows/macos.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 42be8982..565b297f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -60,7 +60,7 @@ jobs:
-o celix/*:enable_ccache=True
run: |
#force require libcurl 7.64.1, due to a sha256 verify issue in
libcurl/7.87.0
- 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
+ conan build . -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