third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: update conan version in all jobs

Browse Source
This commit is contained in:
Luis Diaz 2022-05-19 15:05:35 +02:00
parent 3cd39b789a
commit 0309cb01cb
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/on_PR_linux_matrix.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.45.0
pip3 install conan==1.48.1
- name: Conan common config
run: |

8
.github/workflows/on_PR_linux_special_builds.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.45.0
pip3 install conan==1.48.1
pip3 install gcovr
- name: Conan common config
@ -66,7 +66,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install valgrind ninja-build
pip3 install conan==1.45.0
pip3 install conan==1.48.1
- name: Conan common config
run: |
@ -101,7 +101,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.45.0
pip3 install conan==1.48.1
- name: Conan common config
run: |
@ -135,7 +135,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install valgrind doxygen graphviz gettext ninja-build
pip3 install conan==1.45.0
pip3 install conan==1.48.1
- name: Conan common config
run: |

2
.github/workflows/on_PR_linux_staticAnalysis.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: install dependencies
run: |
pip3 install conan==1.45.0
pip3 install conan==1.48.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

2
.github/workflows/on_PR_windows_matrix.yml vendored
View File

@ -50,7 +50,7 @@ jobs:
- name: Install Conan & Common config
run: |
pip.exe install "conan==1.45.0"
pip.exe install "conan==1.48.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

4
.github/workflows/on_push_BasicWinLinMac.yml vendored
View File

@ -41,7 +41,7 @@ jobs:
- name: Install Conan & Common config
run: |
pip.exe install "conan==1.45.0"
pip.exe install "conan==1.48.1"
conan profile new --detect default
conan profile show default
conan profile update settings.compiler="Visual Studio" default
@ -69,7 +69,7 @@ jobs:
- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.45.0
pip3 install conan==1.48.1
- name: Conan
run: |

2
.github/workflows/on_push_ExtraJobsForMain.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: install dependencies
run: |
pip3 install conan==1.45.0
pip3 install conan==1.48.1
pip install gcovr
- name: Conan common config

2
conanfile.py
View File

@ -24,7 +24,7 @@ class Exiv2Conan(ConanFile):
self.requires('zlib/1.2.12')
if self.options.webready:
self.requires('libcurl/7.79.0')
self.requires('libcurl/7.80.0')
if os_info.is_windows and self.options.iconv:
self.requires('libiconv/1.16')