Skip to content

Commit 94f7144

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 d36cc47 commit 94f7144

File tree

2 files changed

+33
-34
lines changed

2 files changed

+33
-34
lines changed

.github/workflows/ci.yml

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ jobs:
284284
simd: "avx2,f16c"
285285
fmt_ver: 10.1.1
286286
pybind11_ver: v2.12.0
287-
benchmark: 1
288287
setenvs: export PUGIXML_VERSION=v1.14
289288
optional_deps_append: "LibRaw"
290289
- desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
@@ -298,7 +297,6 @@ jobs:
298297
simd: "avx2,f16c"
299298
fmt_ver: 10.1.1
300299
pybind11_ver: v2.12.0
301-
benchmark: 1
302300
setenvs: export PUGIXML_VERSION=v1.14
303301
optional_deps_append: "LibRaw"
304302
- desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
@@ -313,6 +311,31 @@ jobs:
313311
benchmark: 1
314312
setenvs: export PUGIXML_VERSION=v1.15
315313
optional_deps_append: "openjph;Qt6"
314+
- desc: VFX2025 Debug gcc11/C++17 py3.11 exr3.3 ocio2.4
315+
nametag: linux-vfx2025-debug
316+
runner: ubuntu-latest
317+
container: aswf/ci-oiio:2025
318+
cxx_std: 17
319+
build_type: Debug
320+
python_ver: "3.11"
321+
simd: "avx2,f16c"
322+
fmt_ver: 11.2.0
323+
pybind11_ver: v2.13.6
324+
setenvs: export PUGIXML_VERSION=v1.15
325+
optional_deps_append: "openjph;Qt6"
326+
# - desc: VFX2025 Static gcc11/C++17 py3.11 exr3.3 ocio2.4
327+
# nametag: linux-vfx2025-static
328+
# runner: ubuntu-latest
329+
# container: aswf/ci-oiio:2025
330+
# cxx_std: 17
331+
# python_ver: "3.11"
332+
# simd: "avx2,f16c"
333+
# fmt_ver: 11.2.0
334+
# pybind11_ver: v2.13.6
335+
# benchmark: 1
336+
# setenvs: export PUGIXML_VERSION=v1.15
337+
# BUILD_SHARED_LIBS=OFF
338+
# optional_deps_append: "openjph;Qt6"
316339
- desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.4
317340
nametag: linux-vfx2026
318341
runner: ubuntu-latest
@@ -430,9 +453,9 @@ jobs:
430453
cc_compiler: gcc-13
431454
cxx_compiler: g++-13
432455
cxx_std: 20
433-
fmt_ver: 12.0.0
456+
fmt_ver: 12.1.0
434457
opencolorio_ver: v2.5.0
435-
openexr_ver: v3.4.0
458+
openexr_ver: v3.4.3
436459
pybind11_ver: v3.0.1
437460
python_ver: "3.12"
438461
simd: avx2,f16c
@@ -507,39 +530,15 @@ jobs:
507530
pybind11_ver: v2.12.0
508531
python_ver: "3.10"
509532
simd: avx2,f16c
510-
- desc: debug gcc9/C++17, sse4.2, exr3.1
511-
nametag: linux-gcc9-cpp17-debug
512-
runner: ubuntu-22.04
513-
cxx_compiler: g++-9
514-
cxx_std: 17
515-
build_type: Debug
516-
python_ver: "3.10"
517-
simd: sse4.2
518-
openexr_ver: v3.1.13
519-
pybind11_ver: v2.7.0
520-
ctest_test_timeout: 1200
521-
setenvs: export PUGIXML_VERSION=v1.9
522-
- desc: static libs gcc9 C++17 exr3.1
523-
nametag: linux-static
524-
runner: ubuntu-22.04
525-
cxx_compiler: g++-9
526-
cxx_std: 17
527-
openexr_ver: v3.1.13
528-
python_ver: "3.10"
529-
pybind11_ver: v2.7.0
530-
setenvs: export BUILD_SHARED_LIBS=OFF
531-
depcmds: |
532-
sudo rm -rf /usr/local/include/OpenEXR
533-
sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
534533
- desc: Linux ARM latest releases gcc14 C++20 py3.12 exr3.4 ocio2.4
535534
nametag: linux-arm-latest-releases
536535
runner: ubuntu-24.04-arm
537536
cc_compiler: gcc-14
538537
cxx_compiler: g++-14
539538
cxx_std: 20
540-
fmt_ver: 12.0.0
539+
fmt_ver: 12.1.0
541540
opencolorio_ver: v2.5.0
542-
openexr_ver: v3.4.0
541+
openexr_ver: v3.4.3
543542
pybind11_ver: v3.0.1
544543
python_ver: "3.12"
545544
setenvs: export LIBJPEGTURBO_VERSION=3.1.2
@@ -558,9 +557,9 @@ jobs:
558557
cc_compiler: clang-18
559558
cxx_compiler: clang++-18
560559
cxx_std: 20
561-
fmt_ver: 12.0.0
562-
opencolorio_ver: v2.4.2
563-
openexr_ver: v3.4.0
560+
fmt_ver: 12.1.0
561+
opencolorio_ver: v2.5.0
562+
openexr_ver: v3.4.3
564563
pybind11_ver: v3.0.1
565564
python_ver: "3.12"
566565
setenvs: export LIBJPEGTURBO_VERSION=3.1.2

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)