Skip to content

Commit 7a685c5

Browse files
committed
ci: Adjust for recent OIIO and OCIO releases
Signed-off-by: Larry Gritz <[email protected]>
1 parent b8eb28d commit 7a685c5

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
fail-fast: false
5252
matrix:
5353
include:
54-
- desc: gcc9/C++17 llvm14 py3.9 exr3.1 oiio-rel avx2
54+
- desc: gcc9/C++17 llvm14 py3.9 exr3.1 oiio-2.5 avx2
5555
nametag: linux-vfx2022
5656
runner: ubuntu-latest
5757
container: aswftesting/ci-osl:2022-clang14
@@ -63,15 +63,15 @@ jobs:
6363
pybind11_ver: v2.9.0
6464
simd: avx2,f16c
6565
batched: b8_AVX2
66-
- desc: clang14/C++17 llvm14 oiio-main py3.9 avx2 batch-avx512
66+
- desc: clang14/C++17 llvm14 oiio-3.0 py3.9 avx2 batch-avx512
6767
nametag: linux-clang14-llvm14-batch
6868
runner: ubuntu-latest
6969
container: aswftesting/ci-osl:2022-clang14
7070
vfxyear: 2022
7171
old_node: 1
7272
cxx_std: 17
7373
opencolorio_ver: v2.2.1
74-
openimageio_ver: v3.0.6.1
74+
openimageio_ver: v3.0.11.0
7575
python_ver: 3.9
7676
pybind11_ver: v2.7.0
7777
simd: avx2,f16c
@@ -232,22 +232,22 @@ jobs:
232232
fail-fast: false
233233
matrix:
234234
include:
235-
- desc: VP2023 gcc11/C++17 llvm15 py3.10 oiio-rel avx2
235+
- desc: VP2023 gcc11/C++17 llvm15 py3.10 oiio-3.0 avx2
236236
nametag: linux-vfx2023
237237
runner: ubuntu-latest
238238
container: aswftesting/ci-osl:2023-clang15
239239
cxx_std: 17
240-
openimageio_ver: release
240+
openimageio_ver: v3.0.11.0
241241
python_ver: "3.10"
242242
pybind11_ver: v2.9.0
243243
simd: avx2,f16c
244244
batched: b8_AVX2
245-
- desc: VP2024 gcc11/C++17 llvm17 py3.11 oiio-rel avx2
245+
- desc: VP2024 gcc11/C++17 llvm17 py3.11 oiio-3.0 avx2
246246
nametag: linux-vfx2024
247247
runner: ubuntu-latest
248248
container: aswftesting/ci-osl:2024-clang17
249249
cxx_std: 17
250-
openimageio_ver: release
250+
openimageio_ver: v3.0.11.0
251251
python_ver: "3.11"
252252
pybind11_ver: v2.11.1
253253
simd: avx2,f16c
@@ -340,7 +340,7 @@ jobs:
340340
OPENIMAGEIO_CMAKE_FLAGS="-DUSE_PYTHON=0"
341341
CMAKE_BUILD_TYPE=RelWithDebInfo
342342

343-
- desc: icc/C++17 llvm14 py3.9 oiio-main avx2
343+
- desc: icc/C++17 llvm14 py3.9 oiio-2.5 avx2
344344
nametag: linux-icc
345345
runner: ubuntu-latest
346346
container: aswftesting/ci-osl:2023-clang15
@@ -374,7 +374,7 @@ jobs:
374374
cxx_std: 17
375375
fmt_ver: 7.1.3
376376
opencolorio_ver: v2.3.2
377-
openimageio_ver: v3.0.6.1
377+
openimageio_ver: v3.0.11.0
378378
python_ver: "3.10"
379379
pybind11_ver: v2.10.0
380380
simd: avx2,f16c
@@ -411,7 +411,7 @@ jobs:
411411
setenvs: export LLVM_VERSION=14.0.0 LLVM_DISTRO_NAME=ubuntu-18.04
412412
OPENIMAGEIO_CMAKE_FLAGS="-DBUILD_FMT_VERSION=7.0.1"
413413
PUGIXML_VERSION=v1.10
414-
- desc: latest releases gcc11/C++17 llvm17 oiio-3.0 exr3.2 py3.12 avx2 batch-b16avx512
414+
- desc: latest releases gcc11/C++17 llvm17 oiio-rel exr3.2 py3.12 avx2 batch-b16avx512
415415
nametag: linux-latest-releases
416416
runner: ubuntu-24.04
417417
cc_compiler: gcc-13
@@ -453,7 +453,7 @@ jobs:
453453
cc_compiler: clang
454454
cxx_std: 17
455455
fmt_ver: 8.1.1
456-
opencolorio_ver: v2.2.1
456+
opencolorio_ver: v2.5.0
457457
openexr_ver: v3.1.11
458458
openimageio_ver: release
459459
pybind11_ver: v2.13.6

0 commit comments

Comments
 (0)