Merge pull request #1943 from kevinbackhouse/ConanFixMacOS

Fix Conan on macOS (another one)
This commit is contained in:
Kevin Backhouse
2021-10-05 11:11:08 +01:00
committed by GitHub
3 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -3,7 +3,7 @@ name: Mac Matrix on PRs
on: [pull_request]
jobs:
windows:
MacOS:
name: 'MacOS - clang, BuildType:${{matrix.build_type}}, SHARED:${{matrix.shared_libraries}}'
runs-on: macos-latest
@@ -19,7 +19,7 @@ jobs:
- name: install dependencies
run: |
brew install ninja
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Run Conan
run: |
+2 -1
View File
@@ -97,11 +97,12 @@ jobs:
- name: install dependencies
run: |
brew install ninja
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan
run: |
mkdir build && cd build
conan config install https://github.com/conan-io/conanclientcert.git
conan profile new --detect default
conan profile show default
conan install .. -o webready=True --build missing
+1 -1
View File
@@ -67,7 +67,7 @@ jobs:
brew install ninja
brew install tree
brew install gettext
pip3 install conan==1.36.0
pip3 install conan==1.39.0
brew install doxygen
brew install graphviz