Skip to content

Commit e94733c

Browse files
committed
ci: fix broken ci, debug and static cases, bump some latest (AcademySoftwareFoundation#4954)
Two Ubuntu-based cases (debug build and static build) started failing this past week, unrelated to us. I think the runners changed yet again, it seems to be having particular trouble because those tests were trying to use gcc-9. But there's no particular need for that anyway, it just reflects how long ago we last modified those tests. So this spurred a grab bag of CI fixes: * Move the debug and static linkage tests off of raw ubuntu runners and to using the ASWF docker VFX Platform 2025 containers. This makes them more modern and also more stable. * Turns out the "static" test hadn't been working properly lately -- it was accidentally building dynamic libs, not static at all! Fix that, but then it uncovered some problems that are out of scope to fix in this PR. I will look into it separately, but in the mean time I have commented out the static build test to suppress the failures. * Bump a few of the "latest" dependencies to the most recent. --------- Signed-off-by: Larry Gritz <[email protected]>
1 parent bd95812 commit e94733c

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

.github/workflows/ci.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ jobs:
329329
simd: "avx2,f16c"
330330
fmt_ver: 10.1.1
331331
pybind11_ver: v2.12.0
332-
benchmark: 1
333332
setenvs: export PUGIXML_VERSION=v1.14
334333
- desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
335334
nametag: linux-vfx2024.clang
@@ -341,7 +340,6 @@ jobs:
341340
simd: "avx2,f16c"
342341
fmt_ver: 10.1.1
343342
pybind11_ver: v2.12.0
344-
benchmark: 1
345343
setenvs: export PUGIXML_VERSION=v1.14
346344
- desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
347345
nametag: linux-vfx2025
@@ -354,6 +352,32 @@ jobs:
354352
pybind11_ver: v2.13.6
355353
benchmark: 1
356354
setenvs: export PUGIXML_VERSION=v1.15
355+
optional_deps_append: "openjph;Qt6"
356+
- desc: VFX2025 Debug gcc11/C++17 py3.11 exr3.3 ocio2.4
357+
nametag: linux-vfx2025-debug
358+
runner: ubuntu-latest
359+
container: aswf/ci-oiio:2025
360+
cxx_std: 17
361+
build_type: Debug
362+
python_ver: "3.11"
363+
simd: "avx2,f16c"
364+
fmt_ver: 11.2.0
365+
pybind11_ver: v2.13.6
366+
setenvs: export PUGIXML_VERSION=v1.15
367+
optional_deps_append: "openjph;Qt6"
368+
# - desc: VFX2025 Static gcc11/C++17 py3.11 exr3.3 ocio2.4
369+
# nametag: linux-vfx2025-static
370+
# runner: ubuntu-latest
371+
# container: aswf/ci-oiio:2025
372+
# cxx_std: 17
373+
# python_ver: "3.11"
374+
# simd: "avx2,f16c"
375+
# fmt_ver: 11.2.0
376+
# pybind11_ver: v2.13.6
377+
# benchmark: 1
378+
# setenvs: export PUGIXML_VERSION=v1.15
379+
# BUILD_SHARED_LIBS=OFF
380+
# optional_deps_append: "openjph;Qt6"
357381
- desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.4
358382
nametag: linux-vfx2026
359383
runner: ubuntu-latest
@@ -421,10 +445,10 @@ jobs:
421445
cc_compiler: gcc-13
422446
cxx_compiler: g++-13
423447
cxx_std: 20
424-
fmt_ver: 11.2.0
448+
fmt_ver: 12.1.0
425449
opencolorio_ver: v2.5.0
426-
openexr_ver: v3.4.0
427-
pybind11_ver: v3.0.0
450+
openexr_ver: v3.4.3
451+
pybind11_ver: v3.0.1
428452
python_ver: "3.12"
429453
simd: avx2,f16c
430454
setenvs: export LIBJPEGTURBO_VERSION=3.1.1
@@ -490,40 +514,16 @@ jobs:
490514
pybind11_ver: v2.12.0
491515
python_ver: "3.10"
492516
simd: avx2,f16c
493-
- desc: debug gcc9/C++17, sse4.2, exr3.1
494-
nametag: linux-gcc9-cpp17-debug
495-
runner: ubuntu-22.04
496-
cxx_compiler: g++-9
497-
cxx_std: 17
498-
build_type: Debug
499-
python_ver: "3.10"
500-
simd: sse4.2
501-
openexr_ver: v3.1.13
502-
pybind11_ver: v2.7.0
503-
ctest_test_timeout: 1200
504-
setenvs: export PUGIXML_VERSION=v1.9
505-
- desc: static libs gcc9 C++17 exr3.1
506-
nametag: linux-static
507-
runner: ubuntu-22.04
508-
cxx_compiler: g++-9
509-
cxx_std: 17
510-
openexr_ver: v3.1.13
511-
python_ver: "3.10"
512-
pybind11_ver: v2.7.0
513-
setenvs: export BUILD_SHARED_LIBS=OFF
514-
depcmds: |
515-
sudo rm -rf /usr/local/include/OpenEXR
516-
sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
517517
- desc: Linux ARM latest releases gcc14 C++20 py3.12 exr3.4 ocio2.4
518518
nametag: linux-arm-latest-releases
519519
runner: ubuntu-24.04-arm
520520
cc_compiler: gcc-14
521521
cxx_compiler: g++-14
522522
cxx_std: 20
523-
fmt_ver: 11.2.0
523+
fmt_ver: 12.1.0
524524
opencolorio_ver: v2.5.0
525-
openexr_ver: v3.4.0
526-
pybind11_ver: v3.0.0
525+
openexr_ver: v3.4.3
526+
pybind11_ver: v3.0.1
527527
python_ver: "3.12"
528528
setenvs: export LIBJPEGTURBO_VERSION=3.1.1
529529
LIBRAW_VERSION=0.21.4
@@ -540,10 +540,10 @@ jobs:
540540
cc_compiler: clang-18
541541
cxx_compiler: clang++-18
542542
cxx_std: 20
543-
fmt_ver: 11.2.0
544-
opencolorio_ver: v2.4.2
545-
openexr_ver: v3.4.0
546-
pybind11_ver: v3.0.0
543+
fmt_ver: 12.1.0
544+
opencolorio_ver: v2.5.0
545+
openexr_ver: v3.4.3
546+
pybind11_ver: v3.0.1
547547
python_ver: "3.12"
548548
setenvs: export LIBJPEGTURBO_VERSION=3.1.0
549549
LIBRAW_VERSION=0.21.4

src/cmake/compiler.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ message(VERBOSE "Setting SOVERSION to: ${SOVERSION}")
655655
# BUILD_SHARED_LIBS, if turned off, will disable building of .so/.dll
656656
# dynamic libraries and instead only build static libraries.
657657
#
658-
option (BUILD_SHARED_LIBS "Build shared libraries (set to OFF to build static libs)" ON)
658+
set_option (BUILD_SHARED_LIBS "Build shared libraries (set to OFF to build static libs)" ON)
659659
if (NOT BUILD_SHARED_LIBS)
660660
add_compile_definitions (${PROJ_NAME}_STATIC_DEFINE=1)
661661
endif ()

0 commit comments

Comments
 (0)