Skip to content

Commit

Permalink
Merge pull request #2540 from neheb/r
Browse files Browse the repository at this point in the history
github CI: update conan
  • Loading branch information
neheb authored Mar 8, 2023
2 parents 3d2bcf1 + 7bb890f commit 1697417
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 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 install -y tree
python3 -m pip install conan==1.55.0 ninja
python3 -m pip install conan==1.59.0 ninja
- 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 @@ -23,7 +23,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.55.0 gcovr ninja
python3 -m pip install conan==1.59.0 gcovr ninja
- name: Conan common config
run: |
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- name: install dependencies
run: |
sudo apt install -y valgrind
python3 -m pip install conan==1.55.0 ninja
python3 -m pip install conan==1.59.0 ninja
- name: Conan common config
run: |
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.55.0 ninja
python3 -m pip install conan==1.59.0 ninja
- name: Conan common config
run: |
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
- name: install dependencies
run: |
sudo apt install -y valgrind doxygen graphviz gettext
python3 -m pip install conan==1.55.0 ninja
python3 -m pip install conan==1.59.0 ninja
- 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: |
python3 -m pip install conan==1.55.0
python3 -m pip install conan==1.59.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_push_ExtraJobsForMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.55.0 gcovr ninja
python3 -m pip install conan==1.59.0 gcovr ninja
- name: Conan common config
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:

- name: Install Conan & Common config
run: |
python -m pip install conan==1.55.0
python -m pip install conan==1.59.0
conan profile new --detect default
conan profile show default
conan profile update settings.build_type=Release default
Expand Down

0 comments on commit 1697417

Please sign in to comment.