Skip to content

Commit

Permalink
CI: update to latest conan 1
Browse files Browse the repository at this point in the history
Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb committed Jan 27, 2024
1 parent 2d7814b commit c8d1192
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 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.59.0 ninja
python3 -m pip install conan==1.* ninja
- name: Conan common config
run: |
Expand Down
10 changes: 5 additions & 5 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 -y libxml2-dev libxslt-dev python3-dev
python3 -m pip install conan==1.59.0 gcovr ninja
python3 -m pip install conan==1.* gcovr ninja
- name: Conan common config
run: |
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: install dependencies
run: |
sudo apt install -y valgrind
python3 -m pip install conan==1.59.0 ninja
python3 -m pip install conan==1.* ninja
- name: Conan common config
run: |
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.59.0 ninja
python3 -m pip install conan==1.* ninja
- name: Conan common config
run: |
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.59.0 ninja
python3 -m pip install conan==1.* ninja
- name: Conan common config
run: |
Expand All @@ -158,7 +158,7 @@ jobs:
- name: install dependencies
run: |
sudo apt install -y valgrind doxygen graphviz gettext
python3 -m pip install conan==1.59.0 ninja
python3 -m pip install conan==1.* 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.59.0
python3 -m pip install conan==1.*
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 @@ -45,7 +45,7 @@ jobs:

- name: Install Conan & Common config
run: |
python -m pip install conan==1.59.0
python -m pip install conan==1.*
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 @@ -35,7 +35,7 @@ jobs:

- name: Install Conan & Common config
run: |
python -m pip install conan==1.59.0
python -m pip install conan==1.*
conan profile new --detect default
conan profile show default
conan profile update settings.compiler="Visual Studio" default
Expand All @@ -62,7 +62,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.59.0 ninja
python3 -m pip install conan==1.* ninja
- 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 @@ -24,7 +24,7 @@ jobs:

- name: install dependencies
run: |
python3 -m pip install conan==1.59.0 gcovr ninja
python3 -m pip install conan==1.* gcovr ninja
- name: Conan common config
run: |
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 install -y gettext doxygen graphviz
python -m pip install conan==1.59.0 ninja
python -m pip install conan==1.* ninja
- name: Conan common config
run: |
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:

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

0 comments on commit c8d1192

Please sign in to comment.