Merge pull request #2240 from Exiv2/mainConanUpdate
Fix CI jobs - Update conan packages
This commit is contained in:
commit
0594f8670c
2
.github/workflows/on_PR_linux_matrix.yml
vendored
2
.github/workflows/on_PR_linux_matrix.yml
vendored
@ -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: |
|
||||
|
||||
@ -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: |
|
||||
|
||||
@ -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
2
.github/workflows/on_PR_windows_matrix.yml
vendored
@ -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
4
.github/workflows/on_push_BasicWinLinMac.yml
vendored
@ -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: |
|
||||
|
||||
@ -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
|
||||
|
||||
@ -21,10 +21,10 @@ class Exiv2Conan(ConanFile):
|
||||
self.options['gtest'].shared = False
|
||||
|
||||
def requirements(self):
|
||||
self.requires('zlib/1.2.11')
|
||||
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')
|
||||
@ -37,7 +37,7 @@ class Exiv2Conan(ConanFile):
|
||||
if self.options.xmp:
|
||||
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
|
||||
else:
|
||||
self.requires('expat/2.4.1')
|
||||
self.requires('expat/2.4.8')
|
||||
|
||||
def imports(self):
|
||||
self.copy('*.dll', dst='bin', src='bin')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user