Bump versions on more dependencies

- Skip build of 13.6.5 - Bump checkout action version in workflows
sintef-ocean · Mar 22, 2024 · 23f381e · 23f381e
1 parent 0221662
commit 23f381e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/ci-conan-clang.yml b/.github/workflows/ci-conan-clang.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         conan: ["2.0"]
-        version: [13.6.5, 14.1.1]
+        version: [14.1.1]
         build_type: [Debug, Release]
         profile: [clang]
         compiler_version: [11, 12, 13, 14]
@@ -33,7 +33,7 @@ jobs:
       image: conanio/clang${{ matrix.compiler_version }}-ubuntu18.04
       options: -u 0
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install prerequisites
         run: |
           sudo apt-get update

diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         conan: ["2.0"]
-        version: [13.6.5, 14.1.1]
+        version: [14.1.1]
         configs: ["default", "fhsim"]
         build_type: [Debug, Release]
         profile: [gcc]
@@ -34,7 +34,7 @@ jobs:
       image: conanio/gcc${{ matrix.compiler_version }}-ubuntu18.04
       options: -u 0
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install prerequisites
         run: |
           sudo apt-get update

diff --git a/.github/workflows/ci-conan-msvc.yml b/.github/workflows/ci-conan-msvc.yml
@@ -23,14 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         conan: ["2.0"]
-        version: [13.6.5, 14.1.1]
+        version: [14.1.1]
         configs: ["default", "fhsim"]
         build_type: [Debug, Release]
         profile: [msvc17]
         compiler_version: [191, 192, 193]
         channel: ["${{ (github.head_ref || github.ref_name) == 'master' && 'stable' || 'testing' }}"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install prerequisites
         run: |
           pip3 install --upgrade setuptools pip

diff --git a/conandata.yml b/conandata.yml
@@ -22,22 +22,22 @@ dependencies:
     freetype: 2.13.2
     glslang: 11.7.0
     gtest: 1.11.0
-    llvm-openmp: 12.0.1
+    llvm-openmp: 17.0.6
     cmake: "[>=3.16 <4]"
-    openexr: 2.5.7
+    openexr: 2.5.9
     opengl: system
     openssl: "[>=1.1 <4]"
     pugixml: 1.14
     qt5: "[>=5.15 <6]"
     qt6: "[>=6.1]"
     sdl: "[>=2.28.0 <2.30]"
     swig: "[>=4 <5]"
-    vulkan-loader: 1.3.243.0
+    vulkan-loader: 1.3.268.0
     xkbcommon: 1.6.0
     xorg: system
     zlib: "[>=1.2.11 <2]"
     libjpeg: 9e
-    libpng: 1.6.40
+    libpng: 1.6.43
   13.6.5:
     assimp: 5.2.2
     bullet3: 3.25
@@ -46,22 +46,22 @@ dependencies:
     freetype: 2.13.2
     glslang: 11.7.0
     gtest: 1.11.0
-    llvm-openmp: 12.0.1
+    llvm-openmp: 17.0.6
     cmake: "[>=3.16 <4]"
-    openexr: 2.5.7
+    openexr: 2.5.9
     opengl: system
     openssl: "[>=1.1 <4]"
     pugixml: 1.14
     qt5: "[>=5.15 <6]"
     qt6: "[>=6.1]"
     sdl: "[>=2.24.1 <2.30]"
     swig: "[>=4 <5]"
-    vulkan-loader: 1.3.243.0
+    vulkan-loader: 1.3.268.0
     xkbcommon: 1.6.0
     xorg: system
     zlib: "[>=1.2.11 <2]"
     libjpeg: 9e
-    libpng: 1.6.40
+    libpng: 1.6.43
   13.5.0:
     assimp: 5.2.2
     bullet3: 3.25
@@ -70,22 +70,22 @@ dependencies:
     freetype: 2.13.2
     glslang: 11.7.0
     gtest: 1.11.0
-    llvm-openmp: 12.0.1
+    llvm-openmp: 17.0.6
     cmake: "[>=3.16 <4]"
-    openexr: 2.5.7
+    openexr: 2.5.9
     opengl: system
     openssl: "[>=1.1 <4]"
     pugixml: 1.14
     qt5: "[>=5.15 <6]"
     qt6: "[>=6.1]"
     sdl: "[>=2 <2.1]"
     swig: "[>=4 <5]"
-    vulkan-loader: 1.3.243.0
+    vulkan-loader: 1.3.268.0
     xkbcommon: 1.6.0
     xorg: system
     zlib: "[>=1.2.11 <2]"
     libjpeg: 9e
-    libpng: 1.6.40
+    libpng: 1.6.43
 
 
 patches: