Skip to content

ci: update container versions, move 3 variants from 2022 to Ubuntu #5119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgritz merged 2 commits into from
Mar 31, 2026
Merged

ci: update container versions, move 3 variants from 2022 to Ubuntu #5119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0924cd
ci: update container versions, move 3 variants from 2022 to Ubuntu
lgritz Mar 24, 2026
055ac37
just apt-get gcc instead of using egor-tensin/setup-gcc action
lgritz Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/build-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,18 @@ on:
type: string
fmt_commit:
type: string
gcc_action_ver:
type: string
llvm_action_ver:
type: string
opencolorio_ver:
type: string
openexr_ver:
type: string
pybind11_ver:
type: string
python_action_ver:
type: string
python_ver:
type: string
setenvs:
Expand Down Expand Up @@ -80,6 +86,8 @@ on:
type: string
optional_deps:
type: string
build_local_deps:
type: string
secrets:
PASSED_GITHUB_TOKEN:
required: false
Expand Down Expand Up @@ -125,6 +133,7 @@ jobs:
# against and testing an optional dependency, but in fact are not.
OpenImageIO_REQUIRED_DEPS: ${{inputs.required_deps}}
OpenImageIO_OPTIONAL_DEPS: ${{inputs.optional_deps}}
OpenImageIO_BUILD_LOCAL_DEPS: ${{inputs.build_local_deps}}
SETENVS: ${{inputs.setenvs}}
DEPCMDS: ${{inputs.depcmds}}

Expand Down Expand Up @@ -167,6 +176,22 @@ jobs:
# path: ./ccache
key: ${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
restore-keys: ${{inputs.nametag}}
- name: Install gcc
if: inputs.gcc_action_ver != ''
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get update -y
sudo apt-get install -y g++-${{inputs.gcc_action_ver}}
- name: Install python
if: inputs.python_action_ver != ''
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: ${{ inputs.python_action_ver }}
- name: Install LLVM and Clang
if: inputs.llvm_action_ver != ''
uses: KyleMayes/install-llvm-action@ebc0426251bc40c7cd31162802432c68818ab8f0 # v2.0.9
Copy link
Copy Markdown

@jfpanisset jfpanisset Mar 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you mainly care about llvm 11 (ore more specifically 11.0.1), you could possibly just download it directly from:

https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-20.10.tar.xz

It unpacks into:

clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-20.10/bin
clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-20.10/lib

etc. You could probably slam it into /usr/local with something like:

- name: Install LLVM and Clang
  if: inputs.llvm_actino_ver != ''
  run: |
      curl -fsSL https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-20.10.tar.xz | sudo tar -xJf - -C /usr/local/ --strip-components=1

This would also avoid an unknown GHA dependency.

Copy link
Copy Markdown
Collaborator Author

@lgritz lgritz Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already use this action in osl (where I also use it for various versions), and since I'm locking down to a specific commit hash, I'm not especially worried about the provenance. I could do it by hand, but using the action is a convenient way to get uniform behavior across versions and platforms, without my having to track down or debug the full URLs and whatnot, and it will set up the paths for me. It's just outsourcing the legwork of setting up this dependency.

with:
version: ${{ inputs.llvm_action_ver }}
- name: Dependencies
shell: bash
run: |
Expand Down
200 changes: 117 additions & 83 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ jobs:
# only the ones we are intentionally not testing for those jobs.
required_deps: ${{ matrix.required_deps || 'all' }}
optional_deps: ${{ matrix.optional_deps || 'DCMTK;JXL;Libheif;Nuke;OpenCV;openjph;OpenVDB;Qt5;R3DSDK;'}}${{matrix.optional_deps_append}}
build_local_deps: ${{ matrix.build_local_deps }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -119,78 +120,6 @@ jobs:
setenvs: export FREETYPE_VERSION=VER-2-12-0
BUILD_PNG_VERSION=1.6.30
optional_deps_append: 'FFmpeg;LibRaw;Ptex;Qt6'
- desc: oldest gcc9.3/C++17 py3.9 exr3.1 ocio2.3
# Oldest gcc and versions of the dependencies that we support.
nametag: linux-oldest
runner: ubuntu-latest
container: aswf/ci-osl:2022
vfxyear: 2022
old_node: 1
cxx_std: 17
fmt_ver: 9.0.0
fmt_commit: c4ee726532178e556d923372f29163bd206d7732
opencolorio_ver: v2.3.0
openexr_ver: v3.1.0
pybind11_ver: v2.7.0
python_ver: 3.9
setenvs: export CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
PUGIXML_VERSION=v1.8
BUILD_PNG_VERSION=1.6.0
depcmds: sudo rm -rf /usr/local/include/OpenEXR
optional_deps_append: 'FFmpeg;LibRaw;Ptex;Qt6'
- desc: oldest clang10/C++17 py3.9 exr3.1 ocio2.3
# Oldest clang and versions of the dependencies that we support.
nametag: linux-oldest-clang
runner: ubuntu-latest
container: aswf/ci-osl:2022-clang10
vfxyear: 2021
old_node: 1
cc_compiler: clang
cxx_compiler: clang++
cxx_std: 17
fmt_ver: 9.0.0
fmt_commit: c4ee726532178e556d923372f29163bd206d7732
opencolorio_ver: v2.3.0
openexr_ver: v3.1.0
pybind11_ver: v2.7.0
python_ver: 3.9
setenvs: export CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
PUGIXML_VERSION=v1.8
BUILD_PNG_VERSION=1.6.0
depcmds: sudo rm -rf /usr/local/include/OpenEXR
optional_deps_append: 'FFmpeg;LibRaw;Ptex;Qt6'
- desc: hobbled gcc9.3/C++17 py3.9 exr-3.1 no-sse
# Use the oldest supported versions of required dependencies, and
# disable most optional dependencies and features (no SSE or
# OpenCV, don't embed plugins).
nametag: linux-disabled
runner: ubuntu-latest
container: aswf/ci-osl:2022
vfxyear: 2022
old_node: 1
cxx_std: 17
fmt_ver: 9.0.0
fmt_commit: c4ee726532178e556d923372f29163bd206d7732
opencolorio_ver: v2.3.0
openexr_ver: v3.1.0
pybind11_ver: v2.7.0
python_ver: 3.9
simd: 0
setenvs: export EMBEDPLUGINS=0
CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
USE_JPEGTURBO=0
USE_OPENCV=0
FREETYPE_VERSION=VER-2-10-0
PUGIXML_VERSION=v1.8
BUILD_PNG_VERSION=1.6.0
depcmds: sudo rm -rf /usr/local/include/OpenEXR
required_deps: none


#
Expand Down Expand Up @@ -234,6 +163,7 @@ jobs:
# only the ones we are intentionally not testing for those jobs.
required_deps: ${{ matrix.required_deps || 'all' }}
optional_deps: ${{ matrix.optional_deps || 'DCMTK;FFmpeg;JXL;Libheif;Nuke;OpenCV;openjph;OpenVDB;Qt5;R3DSDK;'}}${{matrix.optional_deps_append}}
build_local_deps: ${{ matrix.build_local_deps }}
strategy:
fail-fast: false
matrix:
Expand All @@ -253,7 +183,7 @@ jobs:
- desc: VFX2024 gcc11/C++17 py3.11 exr3.2 ocio2.3
nametag: linux-vfx2024
runner: ubuntu-latest
container: aswf/ci-oiio:2024.2
container: aswf/ci-oiio:2024.6
opencolorio_ver: v2.3.2
python_ver: "3.11"
simd: "avx2,f16c"
Expand All @@ -265,7 +195,7 @@ jobs:
- desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
nametag: linux-vfx2024.clang
runner: ubuntu-latest
container: aswf/ci-oiio:2024.2
container: aswf/ci-oiio:2024.6
cc_compiler: clang
cxx_compiler: clang++
opencolorio_ver: v2.3.2
Expand All @@ -279,7 +209,7 @@ jobs:
- desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
nametag: linux-vfx2025
runner: ubuntu-latest
container: aswf/ci-oiio:2025
container: aswf/ci-oiio:2025.5
cxx_std: 17
python_ver: "3.11"
simd: "avx2,f16c"
Expand All @@ -292,7 +222,7 @@ jobs:
- desc: VFX2025 Debug gcc11/C++17 py3.11 exr3.3 ocio2.4
nametag: linux-vfx2025-debug
runner: ubuntu-latest
container: aswf/ci-oiio:2025
container: aswf/ci-oiio:2025.5
cxx_std: 17
build_type: Debug
ctest_test_timeout: "240"
Expand All @@ -306,7 +236,7 @@ jobs:
# - desc: VFX2025 Static gcc11/C++17 py3.11 exr3.3 ocio2.4
# nametag: linux-vfx2025-static
# runner: ubuntu-latest
# container: aswf/ci-oiio:2025
# container: aswf/ci-oiio:2025.5
# cxx_std: 17
# python_ver: "3.11"
# simd: "avx2,f16c"
Expand All @@ -319,7 +249,7 @@ jobs:
- desc: VFX2025 icx/C++17 py3.11 exr3.3 ocio2.4 qt5.15
nametag: linux-vfx2025.icx
runner: ubuntu-latest
container: aswf/ci-oiio:2025
container: aswf/ci-oiio:2025.5
cc_compiler: icx
cxx_compiler: icpx
fmt_ver: 11.2.0
Expand All @@ -333,10 +263,10 @@ jobs:
UHDR_CMAKE_CXX_COMPILER=g++
# Building libuhdr with icx results in test failures
optional_deps_append: "LibRaw;Ptex;openjph;Qt6"
- desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.4
- desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.5
nametag: linux-vfx2026
runner: ubuntu-latest
container: aswf/ci-oiio:2026
container: aswf/ci-oiio:2026.3
cxx_std: 20
python_ver: "3.13"
simd: "avx2,f16c"
Expand Down Expand Up @@ -366,7 +296,7 @@ jobs:
- desc: ABI check
nametag: abi-check
runner: ubuntu-latest
container: aswf/ci-oiio:2025
container: aswf/ci-oiio:2025.5
build_type: RelWithDebInfo
fmt_ver: 11.1.4
fmt_commit: 123913715afeb8a437e6388b4473fcc4753e1c9a
Expand Down Expand Up @@ -417,10 +347,14 @@ jobs:
ctest_test_timeout: ${{ matrix.ctest_test_timeout }}
coverage: ${{ matrix.coverage || 0 }}
sonar: ${{ matrix.sonar || 0 }}
gcc_action_ver: ${{ matrix.gcc_action_ver }}
llvm_action_ver: ${{ matrix.llvm_action_ver }}
python_action_ver: ${{ matrix.python_action_ver }}
# Override required_deps to be 'all' and explicitly list as optional
# only the ones we are intentionally not testing for those jobs.
required_deps: ${{ matrix.required_deps || 'all' }}
optional_deps: ${{ matrix.optional_deps || 'CUDAToolkit;DCMTK;JXL;Nuke;OpenGL;openjph;OpenVDB;Ptex;pystring;Qt5;R3DSDK;' }}${{matrix.optional_deps_append}}
build_local_deps: ${{ matrix.build_local_deps }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -511,8 +445,8 @@ jobs:
cxx_std: 17
python_ver: "3.10"
simd: avx2,f16c
setenvs: export OpenImageIO_BUILD_LOCAL_DEPS=all
OpenImageIO_DEPENDENCY_BUILD_VERBOSE=ON
build_local_deps: all
setenvs: export OpenImageIO_DEPENDENCY_BUILD_VERBOSE=ON
LIBRAW_VERSION=0.22.0
PTEX_VERSION=v2.4.2
PUGIXML_VERSION=v1.14
Expand Down Expand Up @@ -577,6 +511,104 @@ jobs:
FREETYPE_VERSION=VER-2-14-1
USE_OPENVDB=0

- desc: oldest gcc9/C++17 py3.9 exr3.1 ocio2.3
# Oldest gcc and versions of the dependencies that we support.
nametag: linux-oldest-ubuntu
runner: ubuntu-22.04
cc_compiler: gcc-9
cxx_compiler: g++-9
cxx_std: 17
fmt_ver: 9.0.0
fmt_commit: c4ee726532178e556d923372f29163bd206d7732
opencolorio_ver: v2.3.0
openexr_ver: v3.1.0
pybind11_ver: v2.7.0
python_ver: "3.9"
python_action_ver: "3.9"
gcc_action_ver: 9
setenvs: export CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
PUGIXML_VERSION=v1.8
BUILD_PNG_VERSION=1.6.0
PIP_SUFFIX=.9
PIP_INSTALLS=numpy
Robinmap_BUILD_VERSION=1.2.0
Robinmap_GIT_COMMIT=68ff7325b3898fca267a103bad5c509e8861144d
TIFF_BUILD_VERSION=4.0.0
TIFF_GIT_COMMIT=f7b79dc7dc86ccbaabe9882e2b9ffa5ee8dac917
# OpenJPEG_BUILD_VERSION=2.2.0
# OpenJPEG_GIT_COMMIT=3d7cde5fc9fbc5618d02160900d32e02ed12a00e
optional_deps_append: 'FFmpeg;LibRaw;Ptex;Qt6'
build_local_deps: 'TIFF'
- desc: oldest clang11/C++17 py3.9 exr3.1 ocio2.3
# Oldest clang and versions of the dependencies that we support.
nametag: linux-oldest-clang-ubuntu
runner: ubuntu-22.04
cxx_std: 17
fmt_ver: 9.0.0
fmt_commit: c4ee726532178e556d923372f29163bd206d7732
opencolorio_ver: v2.3.0
openexr_ver: v3.1.0
pybind11_ver: v2.7.0
python_ver: "3.9"
python_action_ver: "3.9"
llvm_action_ver: "11"
setenvs: export CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
PUGIXML_VERSION=v1.8
BUILD_PNG_VERSION=1.6.0
PIP_SUFFIX=.9
PIP_INSTALLS=numpy
OIIO_CC=clang
OIIO_CXX=clang++
Robinmap_BUILD_VERSION=1.2.0
Robinmap_GIT_COMMIT=68ff7325b3898fca267a103bad5c509e8861144d
TIFF_BUILD_VERSION=4.0.0
TIFF_GIT_COMMIT=f7b79dc7dc86ccbaabe9882e2b9ffa5ee8dac917
# OpenJPEG_BUILD_VERSION=2.2.0
# OpenJPEG_GIT_COMMIT=3d7cde5fc9fbc5618d02160900d32e02ed12a00e
optional_deps_append: 'FFmpeg;LibRaw;Ptex;Qt6'
build_local_deps: 'TIFF'

- desc: hobbled gcc9/C++17 py3.9 exr-3.1 no-sse
# Use the oldest supported versions of required dependencies, and
# disable most optional dependencies and features (no SSE or
# OpenCV, don't embed plugins).
nametag: linux-disabled-ubuntu
runner: ubuntu-22.04
cc_compiler: gcc-9
cxx_compiler: g++-9
cxx_std: 17
fmt_ver: 9.0.0
fmt_commit: c4ee726532178e556d923372f29163bd206d7732
opencolorio_ver: v2.3.0
openexr_ver: v3.1.0
pybind11_ver: v2.7.0
python_ver: "3.9"
python_action_ver: "3.9"
gcc_action_ver: 9
simd: 0
setenvs: export EMBEDPLUGINS=0
CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
USE_JPEGTURBO=0
USE_OPENCV=0
USE_LIBUHDR=0
FREETYPE_VERSION=VER-2-10-0
PUGIXML_VERSION=v1.8
BUILD_PNG_VERSION=1.6.0
PIP_SUFFIX=.9
PIP_INSTALLS=numpy
Robinmap_BUILD_VERSION=1.2.0
Robinmap_GIT_COMMIT=68ff7325b3898fca267a103bad5c509e8861144d
TIFF_BUILD_VERSION=4.0.0
TIFF_GIT_COMMIT=f7b79dc7dc86ccbaabe9882e2b9ffa5ee8dac917
required_deps: none
build_local_deps: 'TIFF'


#
# MacOS Tests
Expand Down Expand Up @@ -618,6 +650,7 @@ jobs:
# test in GHA CI.
required_deps: ${{ matrix.required_deps || 'all' }}
optional_deps: ${{ matrix.optional_deps || 'Nuke;R3DSDK;' }}${{matrix.optional_deps_append}}
build_local_deps: ${{ matrix.build_local_deps }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -700,6 +733,7 @@ jobs:
# of exceptions in the future.
required_deps: ${{ matrix.required_deps || 'all' }}
optional_deps: ${{ matrix.optional_deps || 'BZip2;CUDAToolkit;DCMTK;FFmpeg;GIF;JXL;Libheif;LibRaw;Nuke;OpenCV;OpenGL;OpenJPEG;openjph;OpenCV;OpenVDB;Ptex;pystring;Qt5;Qt6;TBB;R3DSDK;${{matrix.optional_deps_append}}' }}
build_local_deps: ${{ matrix.build_local_deps }}
strategy:
fail-fast: false
matrix:
Expand Down
7 changes: 7 additions & 0 deletions src/build-scripts/ci-build.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ export OIIO_SRC_DIR=${OIIO_SRC_DIR:=$PWD}
export OIIO_BUILD_DIR=${OIIO_BUILD_DIR:=${OIIO_SRC_DIR}/build}
export OIIO_INSTALL_DIR=${OIIO_INSTALL_DIR:=${OIIO_SRC_DIR}/dist}
export OIIO_CMAKE_BUILD_TYPE=${OIIO_CMAKE_BUILD_TYPE:=${CMAKE_BUILD_TYPE:=Release}}
# Allow OIIO_specific overrides for CC, CXX
if [[ "$OIIO_CC" != "" ]] ; then
CC=$OIIO_CC
fi
if [[ "$OIIO_CXX" != "" ]] ; then
CXX=$OIIO_CXX
fi

if [[ "$USE_SIMD" != "" ]] ; then
OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
Expand Down
Loading
Loading