Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Conan on macOS (another one) #1943

Merged
merged 2 commits into from
Oct 5, 2021
Merged

Fix Conan on macOS (another one) #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9638bb
Fix Conan on macOS
kevinbackhouse Oct 4, 2021
a0cff12
Use same Conan version on macOS as on other platforms.
kevinbackhouse Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/on_PR_mac_matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/on_push_BasicWinLinMac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down