Skip to content

Commit 7e1fea1

Browse files
committed
Update conan to 2.20.1 to get latest deps from conancenter
1 parent 81d1149 commit 7e1fea1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
need_node20_vol: true
4242
has_cmake_presets: false
4343
buildtype: Release
44-
conan_version: 2.1.0
44+
conan_version: 2.20.1
4545
cxx-standard: 17
4646
cxx-compiler: clang++
4747
cc-compiler: clang
@@ -58,7 +58,7 @@ jobs:
5858
need_node20_vol: true
5959
has_cmake_presets: false
6060
buildtype: Release
61-
conan_version: 2.1.0
61+
conan_version: 2.20.1
6262
cxx-standard: 17
6363
cxx-compiler: clang++
6464
cc-compiler: clang
@@ -74,7 +74,7 @@ jobs:
7474
vfx-cy: 2023
7575
has_cmake_presets: false
7676
buildtype: Release
77-
conan_version: 2.1.0
77+
conan_version: 2.20.1
7878
cxx-standard: 17
7979
cxx-compiler: clang++
8080
cc-compiler: clang
@@ -90,7 +90,7 @@ jobs:
9090
vfx-cy: 2023
9191
has_cmake_presets: false
9292
buildtype: Release
93-
conan_version: 2.1.0
93+
conan_version: 2.20.1
9494
cxx-standard: 17
9595
cxx-compiler: clang++
9696
cc-compiler: clang
@@ -103,7 +103,7 @@ jobs:
103103
os: ubuntu-latest
104104
has_cmake_presets: true
105105
buildtype: Release
106-
conan_version: 2.1.0
106+
conan_version: 2.20.1
107107
cxx-standard: 17
108108
cxx-compiler: clang++
109109
cc-compiler: clang
@@ -129,7 +129,7 @@ jobs:
129129
os: windows-latest
130130
has_cmake_presets: true
131131
buildtype: Release
132-
conan_version: 2.1.0
132+
conan_version: 2.20.1
133133
cxx-standard: 17
134134
cxx-compiler: clang++
135135
cc-compiler: clang

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def requirements(self):
3939
self.requires("opencl-icd-loader/2023.12.14")
4040
self.requires("opencl-headers/2023.12.14")
4141
self.requires("opengl/system") # for OpenGL examples
42-
self.requires("expat/2.7.2") # for HostSupport
42+
self.requires("expat/2.7.1") # for HostSupport
4343
self.requires("cimg/3.3.2") # to draw text into images
4444
self.requires("spdlog/1.13.0") # for logging
4545

0 commit comments

Comments
 (0)