Skip to content

Bump C++, dependencies and update CI workflows #2192

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
doug-walker merged 15 commits into from
Sep 30, 2025
Merged

Bump C++, dependencies and update CI workflows #2192

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a4a113a
Bump dependencies and update CI workflows
remia Sep 19, 2025
a4a1677
- converting [==] operator to [=] to make them POSIX complaint.
cozdas Sep 19, 2025
49e0093
Code cleanup (PR feedback)
remia Sep 20, 2025
1c7f481
Remove ASWF container minor tag
remia Sep 20, 2025
3e3f6ee
Debug dependencies latest Linux
remia Sep 20, 2025
f1aede1
Attempt fixing dependencies latest
remia Sep 20, 2025
26087a3
Try OpenEXR 3.4.0
remia Sep 20, 2025
ae0cfe1
Adjust CMake imported target for OpenEXR 3.4
remia Sep 20, 2025
067b271
Force internal OpenJPH when building OpenEXR
remia Sep 20, 2025
4a51ad4
Attempt to fix OpenJPH library name
remia Sep 20, 2025
df86e99
Merge pull request #67 from cozdas/ozdasc/versionBump_ShellScriptPort…
remia Sep 22, 2025
57a42f9
Adjust comment on OpenJPH version
remia Sep 23, 2025
cfa76f5
Disable Python 3.14 wheels until the official release
remia Sep 23, 2025
2938d11
Cleanup obsolete workarounds for OCIO_PYTHON_LOAD_DLLS_FROM_PATH
remia Sep 23, 2025
ef79c9c
Merge branch 'main' into bump-dependencies
doug-walker Sep 29, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/analysis_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
cmake ../. \
-DCMAKE_INSTALL_PREFIX=../_install \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=14 \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_FLAGS="-g -O0 -fprofile-arcs -ftest-coverage" \
-DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON \
-DCMAKE_EXE_LINKER_FLAGS="-lgcov" \
Expand Down
160 changes: 80 additions & 80 deletions .github/workflows/ci_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,55 @@ jobs:
container:
# DockerHub: https://hub.docker.com/u/aswf
# Source: https://github.com/AcademySoftwareFoundation/aswf-docker
image: aswf/ci-ocio:${{ matrix.vfx-cy }}.1
image: aswf/ci-ocio:${{ matrix.vfx-cy }}
strategy:
fail-fast: true
matrix:
build: [7, 8, 9, 10, 11, 12]
build: [7, 8, 9, 10, 11, 12, 13, 14, 15]
include:
# -------------------------------------------------------------------
# VFX CY2025 (Python 3.11)
# -------------------------------------------------------------------
- build: 15
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 20
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2025
install-ext-packages: MISSING
- build: 14
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-openfx: 'ON'
use-simd: 'OFF'
use-oiio: 'OFF'
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2025
install-ext-packages: ALL
- build: 13
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2025
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2024 (Python 3.11)
# -------------------------------------------------------------------
- build: 12
Expand All @@ -73,7 +115,7 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 17
cxx-standard: 20
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
Expand All @@ -99,7 +141,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
Expand All @@ -115,7 +157,7 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 17
cxx-standard: 20
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
Expand All @@ -141,7 +183,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
Expand Down Expand Up @@ -218,7 +260,7 @@ jobs:
-Dpystring_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_STATIC_LIBRARY=ON \
-Dyaml-cpp_VERSION=0.7.0 \
-Dyaml-cpp_VERSION=0.8.0 \
-DZLIB_ROOT=${{ env.ocio_build_path }}/ext/dist \
-DZLIB_STATIC_LIBRARY=ON \
-Dminizip-ng_ROOT=${{ env.ocio_build_path }}/ext/dist \
Expand Down Expand Up @@ -257,12 +299,12 @@ jobs:
strategy:
fail-fast: true
matrix:
build: [1, 2, 3, 4, 5, 6]
build: [1, 2, 3]
include:
# -------------------------------------------------------------------
# VFX CY2022 (Python 3.9)
# -------------------------------------------------------------------
- build: 6
- build: 1
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
Expand All @@ -275,7 +317,7 @@ jobs:
compiler-desc: Clang
vfx-cy: 2022
install-ext-packages: ALL
- build: 5
- build: 2
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
Expand All @@ -288,60 +330,18 @@ jobs:
compiler-desc: GCC
vfx-cy: 2022
install-ext-packages: MISSING
- build: 4
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2022
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2021 (Python 3.7)
# -------------------------------------------------------------------
- build: 3
build-type: Release
build-shared: 'ON'
build-docs: 'OFF'
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2021
install-ext-packages: MISSING
- build: 2
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-openfx: 'ON'
use-simd: 'OFF'
use-oiio: 'OFF'
cxx-standard: 14
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2021
install-ext-packages: ALL
- build: 1
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2021
vfx-cy: 2022
install-ext-packages: ALL
env:
CXX: ${{ matrix.cxx-compiler }}
Expand Down Expand Up @@ -430,7 +430,7 @@ jobs:
-Dpystring_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_STATIC_LIBRARY=ON \
-Dyaml-cpp_VERSION=0.7.0 \
-Dyaml-cpp_VERSION=0.8.0 \
-DZLIB_ROOT=${{ env.ocio_build_path }}/ext/dist \
-DZLIB_STATIC_LIBRARY=ON \
-Dminizip-ng_ROOT=${{ env.ocio_build_path }}/ext/dist \
Expand Down Expand Up @@ -472,8 +472,8 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 17
python-version: '3.11'
cxx-standard: 20
python-version: '3.13'
# Keeping one universal build
- build: 4
arch-type: "x86_64;arm64"
Expand All @@ -483,8 +483,8 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
python-version: '3.10'
cxx-standard: 20
python-version: '3.12'
- build: 3
arch-type: "x86_64"
build-type: Release
Expand All @@ -493,8 +493,8 @@ jobs:
build-openfx: 'OFF'
use-simd: 'OFF'
use-oiio: 'OFF'
cxx-standard: 11
python-version: '3.10'
cxx-standard: 17
python-version: '3.11'
- build: 2
arch-type: "x86_64"
build-type: Debug
Expand All @@ -503,8 +503,8 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
python-version: '3.9'
cxx-standard: 17
python-version: '3.10'
- build: 1
arch-type: "x86_64"
build-type: Release
Expand All @@ -513,8 +513,8 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 14
python-version: '3.7'
cxx-standard: 17
python-version: '3.9'
steps:
- name: Setup Python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -588,7 +588,7 @@ jobs:
-Dpystring_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_STATIC_LIBRARY=ON \
-Dyaml-cpp_VERSION=0.7.0 \
-Dyaml-cpp_VERSION=0.8.0 \
-DZLIB_ROOT=${{ env.ocio_build_path }}/ext/dist \
-DZLIB_STATIC_LIBRARY=ON \
-Dminizip-ng_ROOT=${{ env.ocio_build_path }}/ext/dist \
Expand Down Expand Up @@ -628,8 +628,8 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
python-version: '3.11'
cxx-standard: 20
python-version: '3.13'
- build: 2
arch-type: "x86_64;arm64"
test-rosetta: "ON"
Expand All @@ -639,8 +639,8 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
python-version: '3.11'
cxx-standard: 17
python-version: '3.12'
steps:
- name: Setup Python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -719,7 +719,7 @@ jobs:
-Dpystring_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_STATIC_LIBRARY=ON \
-Dyaml-cpp_VERSION=0.7.0 \
-Dyaml-cpp_VERSION=0.8.0 \
-DZLIB_ROOT=${{ env.ocio_build_path }}/ext/dist \
-DZLIB_STATIC_LIBRARY=ON \
-Dminizip-ng_ROOT=${{ env.ocio_build_path }}/ext/dist \
Expand Down Expand Up @@ -761,26 +761,26 @@ jobs:
build-openfx: 'ON'
use-simd: 'OFF'
use-oiio: 'ON'
cxx-standard: 17
python-version: '3.11'
cxx-standard: 20
python-version: '3.13'
- build: 3
build-type: Release
build-shared: 'OFF'
build-docs: 'ON'
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
python-version: '3.9'
cxx-standard: 17
python-version: '3.12'
- build: 2
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
python-version: '3.8'
cxx-standard: 17
python-version: '3.11'
# C++14, OpenEXR, OpenFX
- build: 1
build-type: Release
Expand All @@ -789,8 +789,8 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 14
python-version: '3.7'
cxx-standard: 17
python-version: '3.9'
steps:
- name: Setup Python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -874,7 +874,7 @@ jobs:
-Dpystring_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_ROOT=${{ env.ocio_build_path }}/ext/dist \
-Dyaml-cpp_STATIC_LIBRARY=ON \
-Dyaml-cpp_VERSION=0.7.0 \
-Dyaml-cpp_VERSION=0.8.0 \
-DZLIB_ROOT=${{ env.ocio_build_path }}/ext/dist \
-DZLIB_STATIC_LIBRARY=ON \
-Dminizip-ng_ROOT=${{ env.ocio_build_path }}/ext/dist \
Expand Down
Loading
Loading