Skip to content

Commit

Permalink
Standardize on conan 1.39.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinbackhouse committed Sep 9, 2021
1 parent c335521 commit 6c6c32e
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_linux_matrix.yml
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan common config
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/on_PR_linux_special_buils.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install valgrind ninja-build
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install valgrind doxygen graphviz gettext
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan common config
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_windows_matrix.yml
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install conan
pip.exe install "conan==1.39.0"
conan profile new --detect default
conan profile update settings.build_type=${{matrix.build_type}} default
conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_push_BasicWinLinMac.yml
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install conan
pip.exe install "conan==1.39.0"
conan profile new --detect default
conan profile show default
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_ExtraJobsForMain.yml
Expand Up @@ -17,7 +17,7 @@ jobs:

- name: install dependencies
run: |
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan common config
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Expand Up @@ -23,7 +23,7 @@ jobs:
sudo apt-get install gettext
sudo apt-get install doxygen
sudo apt-get install graphviz
pip3 install conan==1.36.0
pip3 install conan==1.39.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Install Conan & Common config
run: |
pip.exe install conan
pip.exe install "conan==1.39.0"
conan profile new --detect default
conan profile update settings.build_type=Release default
conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
Expand Down

0 comments on commit 6c6c32e

Please sign in to comment.