Merge pull request #2240 from Exiv2/mainConanUpdate

Fix CI jobs - Update conan packages
Exiv2 · May 19, 2022 · 0594f86 · 0594f86
2 parents e1ed1df + 0309cb0
commit 0594f86
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml
@@ -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: |

diff --git a/.github/workflows/on_PR_linux_special_builds.yml b/.github/workflows/on_PR_linux_special_builds.yml
@@ -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: |

diff --git a/.github/workflows/on_PR_linux_staticAnalysis.yml b/.github/workflows/on_PR_linux_staticAnalysis.yml
@@ -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

diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml
@@ -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

diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -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: |

diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml
@@ -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

diff --git a/conanfile.py b/conanfile.py
@@ -21,10 +21,10 @@ def configure(self):
         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 @@ def requirements(self):
         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')