Skip to content

Commit 0594f86

Browse files
authored
Merge pull request #2240 from Exiv2/mainConanUpdate
Fix CI jobs - Update conan packages
2 parents e1ed1df + 0309cb0 commit 0594f86

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

.github/workflows/on_PR_linux_matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: install dependencies
2323
run: |
2424
sudo apt-get install ninja-build
25-
pip3 install conan==1.45.0
25+
pip3 install conan==1.48.1
2626
2727
- name: Conan common config
2828
run: |

.github/workflows/on_PR_linux_special_builds.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: install dependencies
2121
run: |
2222
sudo apt-get install ninja-build
23-
pip3 install conan==1.45.0
23+
pip3 install conan==1.48.1
2424
pip3 install gcovr
2525
2626
- name: Conan common config
@@ -66,7 +66,7 @@ jobs:
6666
- name: install dependencies
6767
run: |
6868
sudo apt-get install valgrind ninja-build
69-
pip3 install conan==1.45.0
69+
pip3 install conan==1.48.1
7070
7171
- name: Conan common config
7272
run: |
@@ -101,7 +101,7 @@ jobs:
101101
- name: install dependencies
102102
run: |
103103
sudo apt-get install ninja-build
104-
pip3 install conan==1.45.0
104+
pip3 install conan==1.48.1
105105
106106
- name: Conan common config
107107
run: |
@@ -135,7 +135,7 @@ jobs:
135135
- name: install dependencies
136136
run: |
137137
sudo apt-get install valgrind doxygen graphviz gettext ninja-build
138-
pip3 install conan==1.45.0
138+
pip3 install conan==1.48.1
139139
140140
- name: Conan common config
141141
run: |

.github/workflows/on_PR_linux_staticAnalysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: install dependencies
2121
run: |
22-
pip3 install conan==1.45.0
22+
pip3 install conan==1.48.1
2323
sudo add-apt-repository ppa:ubuntu-lxc/daily -y
2424
wget -q -O - https://files.pvs-studio.com/etc/pubkey.txt |sudo apt-key add -
2525
sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/etc/viva64.list

.github/workflows/on_PR_windows_matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
- name: Install Conan & Common config
5252
run: |
53-
pip.exe install "conan==1.45.0"
53+
pip.exe install "conan==1.48.1"
5454
conan config install https://github.com/conan-io/conanclientcert.git
5555
conan profile new --detect default
5656
conan profile update settings.build_type=${{matrix.build_type}} default

.github/workflows/on_push_BasicWinLinMac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Install Conan & Common config
4343
run: |
44-
pip.exe install "conan==1.45.0"
44+
pip.exe install "conan==1.48.1"
4545
conan profile new --detect default
4646
conan profile show default
4747
conan profile update settings.compiler="Visual Studio" default
@@ -69,7 +69,7 @@ jobs:
6969
- name: install dependencies
7070
run: |
7171
sudo apt-get install ninja-build
72-
pip3 install conan==1.45.0
72+
pip3 install conan==1.48.1
7373
7474
- name: Conan
7575
run: |

.github/workflows/on_push_ExtraJobsForMain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: install dependencies
2121
run: |
22-
pip3 install conan==1.45.0
22+
pip3 install conan==1.48.1
2323
pip install gcovr
2424
2525
- name: Conan common config

conanfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ def configure(self):
2121
self.options['gtest'].shared = False
2222

2323
def requirements(self):
24-
self.requires('zlib/1.2.11')
24+
self.requires('zlib/1.2.12')
2525

2626
if self.options.webready:
27-
self.requires('libcurl/7.79.0')
27+
self.requires('libcurl/7.80.0')
2828

2929
if os_info.is_windows and self.options.iconv:
3030
self.requires('libiconv/1.16')
@@ -37,7 +37,7 @@ def requirements(self):
3737
if self.options.xmp:
3838
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
3939
else:
40-
self.requires('expat/2.4.1')
40+
self.requires('expat/2.4.8')
4141

4242
def imports(self):
4343
self.copy('*.dll', dst='bin', src='bin')

0 commit comments

Comments
 (0)