This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/update_github_actions
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/update_github_actions
by this push:
new 32b7bc2a Re-enable build-conan on MacOS.
32b7bc2a is described below
commit 32b7bc2ae569e79ad88bf97b2c72a494f86cf8e5
Author: PengZheng <[email protected]>
AuthorDate: Thu Jan 19 17:42:10 2023 +0800
Re-enable build-conan on MacOS.
---
.github/workflows/macos.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 2295997e..df76b708 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -9,8 +9,7 @@ on:
jobs:
build-conan:
- if: false #See #471
- runs-on: macOS-latest
+ runs-on: macos-10.15
timeout-minutes: 120
steps:
- name: Checkout source code
@@ -23,6 +22,10 @@ jobs:
run: |
conan profile new default --detect
conan profile update settings.build_type=Release default
+ conan profile update settings.compiler=apple-clang default
+ conan profile update settings.compiler.cppstd=17 default
+ conan profile update settings.compiler.libcxx=libc++ default
+ conan profile update settings.compiler.version=12.0 default
- name: Install Dependencies
env:
CONAN_BUILD_OPTIONS: |
