Skip to content

Commit

Permalink
Merge pull request #2361 from kevinbackhouse/conan-1.52.0
Browse files Browse the repository at this point in the history
Bump conan version to 1.52.0
  • Loading branch information
kevinbackhouse authored Sep 19, 2022
2 parents d2253c9 + e97dc16 commit 250586e
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_linux_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/on_PR_linux_special_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
pip3 install gcovr
- name: Conan common config
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install valgrind ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install valgrind doxygen graphviz gettext ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_linux_staticAnalysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: install dependencies
run: |
pip3 install conan==1.51.0
pip3 install conan==1.52.0
sudo add-apt-repository ppa:ubuntu-lxc/daily -y
wget -q -O - https://files.pvs-studio.com/etc/pubkey.txt |sudo apt-key add -
sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/etc/viva64.list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_windows_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.51.0"
pip.exe install "conan==1.52.0"
conan config install https://github.com/conan-io/conanclientcert.git
conan profile new --detect default
conan profile update settings.build_type=${{matrix.build_type}} default
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_push_BasicWinLinMac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.51.0"
pip.exe install "conan==1.52.0"
conan profile new --detect default
conan profile show default
conan profile update settings.compiler="Visual Studio" default
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_ExtraJobsForMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.51.0
pip3 install conan==1.52.0
pip3 install gcovr
- name: Conan common config
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get install ninja-build gettext doxygen graphviz
pip3 install conan==1.51.0
pip3 install conan==1.52.0
- name: Conan common config
run: |
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.51.0"
pip.exe install "conan==1.52.0"
conan profile new --detect default
conan profile show default
conan profile update settings.build_type=Release default
Expand Down

0 comments on commit 250586e

Please sign in to comment.