Skip to content

Commit 56077d2

Browse files
committed
ci: only test against maximum openimageio 2.5.17.0
I'm really having trouble with the changes to make this old OSL 1.13 work with the brand new OIIO 3.0. For now, rig all the CI tests to use at most OIIO 2.5.latest. I'm still contemplating whether the right solution is (a) do the work necessary to make old 1.13 work with OIIO 3.0+. (b) just get the beta and release of OSL 1.14 (current main) finished, which already works against OIIO 3.0 and which people shold be encouraged to change to ASAP. Signed-off-by: Larry Gritz <[email protected]>
1 parent 9fb2c77 commit 56077d2

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ jobs:
103103
vfxyear: 2022
104104
cxx_std: 17
105105
opencolorio_ver: v2.2.1
106-
openimageio_ver: main
106+
openimageio_ver: v2.5.17.0
107+
# original: openimageio_ver: main
107108
python_ver: 3.9
108109
pybind11_ver: v2.7.0
109110
simd: avx2,f16c
@@ -144,7 +145,8 @@ jobs:
144145
cxx_std: 17
145146
fmt_ver: 7.1.3
146147
opencolorio_ver: v2.3.2
147-
openimageio_ver: main
148+
openimageio_ver: v2.5.17.0
149+
# original: openimageio_ver: main
148150
python_ver: 3.9
149151
pybind11_ver: v2.9.0
150152
simd: avx2,f16c
@@ -174,7 +176,8 @@ jobs:
174176
cc_compiler: clang
175177
cxx_compiler: clang++
176178
cxx_std: 17
177-
openimageio_ver: main
179+
openimageio_ver: v2.5.17.0
180+
# original: openimageio_ver: main
178181
python_ver: 3.9
179182
pybind11_ver: v2.9.0
180183
simd: avx2,f16c
@@ -316,7 +319,8 @@ jobs:
316319
container: aswftesting/ci-osl:2023-clang15
317320
vfxyear: 2023
318321
cxx_std: 17
319-
openimageio_ver: release
322+
openimageio_ver: v2.5.17.0
323+
# original: openimageio_ver: release
320324
python_ver: "3.10"
321325
pybind11_ver: v2.9.0
322326
simd: avx2,f16c
@@ -327,7 +331,8 @@ jobs:
327331
container: aswftesting/ci-osl:2023-clang15
328332
vfxyear: 2023
329333
cxx_std: 17
330-
openimageio_ver: main
334+
openimageio_ver: v2.5.17.0
335+
# original: openimageio_ver: main
331336
python_ver: "3.10"
332337
pybind11_ver: v2.10.0
333338
simd: avx2,f16c
@@ -340,7 +345,8 @@ jobs:
340345
container: aswftesting/ci-osl:2024-clang17
341346
vfxyear: 2024
342347
cxx_std: 17
343-
openimageio_ver: release
348+
openimageio_ver: v2.5.17.0
349+
# original: openimageio_ver: release
344350
python_ver: "3.11"
345351
pybind11_ver: v2.11.1
346352
simd: avx2,f16c
@@ -501,7 +507,8 @@ jobs:
501507
cxx_std: 17
502508
fmt_ver: 10.1.0
503509
openexr_ver: v3.2.1
504-
openimageio_ver: main
510+
openimageio_ver: v2.5.17.0
511+
# original: openimageio_ver: main
505512
pybind11_ver: v2.11.1
506513
python_ver: "3.10"
507514
simd: avx2,f16c
@@ -520,7 +527,8 @@ jobs:
520527
fmt_ver: master
521528
opencolorio_ver: main
522529
openexr_ver: main
523-
openimageio_ver: main
530+
openimageio_ver: v2.5.17.0
531+
# original: openimageio_ver: main
524532
pybind11_ver: master
525533
python_ver: "3.10"
526534
simd: avx2,f16c
@@ -537,7 +545,8 @@ jobs:
537545
fmt_ver: 8.1.1
538546
opencolorio_ver: v2.2.1
539547
openexr_ver: v3.1.11
540-
openimageio_ver: release
548+
openimageio_ver: v2.5.17.0
549+
# original: openimageio_ver: release
541550
pybind11_ver: v2.9.2
542551
python_ver: 3.8
543552
simd: avx2,f16c
@@ -558,7 +567,8 @@ jobs:
558567
extra_artifacts: "src/*.*"
559568
opencolorio_ver: v2.4.0
560569
openexr_ver: v3.1.11
561-
openimageio_ver: release
570+
openimageio_ver: v2.5.17.0
571+
# original: openimageio_ver: release
562572
python_ver: "3.10"
563573
simd: avx2,f16c
564574
batched: b8_AVX2
@@ -638,7 +648,8 @@ jobs:
638648
cc_compiler: /usr/local/opt/llvm/bin/clang
639649
cxx_compiler: /usr/local/opt/llvm/bin/clang++
640650
cxx_std: 17
641-
openimageio_ver: release
651+
openimageio_ver: v2.5.17.0
652+
# original: openimageio_ver: release
642653
python_ver: "3.11"
643654
aclang: 14
644655
setenvs: export DO_BREW_UPDATE=1 CTEST_TEST_TIMEOUT=120
@@ -650,7 +661,8 @@ jobs:
650661
Xcc_compiler: /usr/local/opt/llvm/bin/clang
651662
Xcxx_compiler: /usr/local/opt/llvm/bin/clang++
652663
cxx_std: 17
653-
openimageio_ver: main
664+
openimageio_ver: v2.5.17.0
665+
# original: openimageio_ver: main
654666
python_ver: "3.11"
655667
aclang: 15
656668
setenvs: export DO_BREW_UPDATE=1

0 commit comments

Comments
 (0)