Skip to content

Upgrade versions #3

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

Open
cozdas wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Upgrade versions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9095d47
- Bumping C++ standard: 11&14->17, 17->20
cozdas Sep 16, 2025
1c0577d
- updating the cmake files to drop C++11 and c++14 support and adding…
cozdas Sep 16, 2025
e05ee0e
- adding vfx CY2025 platform. Trying C++23, can downgrade to c++20 if…
cozdas Sep 16, 2025
1d53ee7
- fixes to cppversion.cmake
cozdas Sep 16, 2025
f813fe1
- Updating expat to min:2.6.0, recommended:2.7
cozdas Sep 16, 2025
fc73a37
typo fix
cozdas Sep 16, 2025
1bcda83
- updating yaml-cpp to v0.8.0
cozdas Sep 17, 2025
5172699
- Fixing yaml issues with 0.8.0.
cozdas Sep 17, 2025
2002a76
- Builds are fine but some jobs are failing on tests on static consum…
cozdas Sep 17, 2025
f89298d
- another attempt to upgrade the CI environment to work with yaml 0.8.0
cozdas Sep 17, 2025
a017aaf
- increasing the zlib recommended version to 1.3.1
cozdas Sep 17, 2025
6b27456
- bumping up pystring to 1.1.4. Interestingly enough the local build …
cozdas Sep 17, 2025
3d3ca6f
- Removing OpenEXR_MININUM_VERSION variable in cmake files as it's no…
cozdas Sep 17, 2025
5dd48a3
- Imath reccomended to 3.2.1
cozdas Sep 18, 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
138 changes: 69 additions & 69 deletions .github/workflows/ci_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,53 @@ jobs:
# Source: https://github.com/AcademySoftwareFoundation/aswf-docker
image: aswf/ci-ocio:${{ matrix.vfx-cy }}.1
strategy:
fail-fast: true
fail-fast: false
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: 23
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: 20
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: 23
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,7 +472,7 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 17
cxx-standard: 20
python-version: '3.11'
# Keeping one universal build
- build: 4
Expand All @@ -483,7 +483,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
python-version: '3.10'
- build: 3
arch-type: "x86_64"
Expand All @@ -493,7 +493,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'OFF'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
python-version: '3.10'
- build: 2
arch-type: "x86_64"
Expand All @@ -503,7 +503,7 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
python-version: '3.9'
- build: 1
arch-type: "x86_64"
Expand All @@ -513,7 +513,7 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 14
cxx-standard: 17
python-version: '3.7'
steps:
- name: Setup Python
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,7 +628,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
python-version: '3.11'
- build: 2
arch-type: "x86_64;arm64"
Expand All @@ -639,7 +639,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
python-version: '3.11'
steps:
- name: Setup Python
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,7 +761,7 @@ jobs:
build-openfx: 'ON'
use-simd: 'OFF'
use-oiio: 'ON'
cxx-standard: 17
cxx-standard: 20
python-version: '3.11'
- build: 3
build-type: Release
Expand All @@ -770,7 +770,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
python-version: '3.9'
- build: 2
build-type: Debug
Expand All @@ -779,7 +779,7 @@ jobs:
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 11
cxx-standard: 17
python-version: '3.8'
# C++14, OpenEXR, OpenFX
- build: 1
Expand All @@ -789,7 +789,7 @@ jobs:
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'OFF'
cxx-standard: 14
cxx-standard: 17
python-version: '3.7'
steps:
- name: Setup Python
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
24 changes: 12 additions & 12 deletions .github/workflows/dependencies_latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ jobs:
- name: Install fixed ext package versions
# Minizip-ng depends on ZLIB. ZLIB must be installed first.
run: |
share/ci/scripts/multi/install_expat.sh 2.4.1 $EXT_PATH
share/ci/scripts/multi/install_expat.sh 2.6.0 $EXT_PATH
share/ci/scripts/multi/install_lcms2.sh 2.2 $EXT_PATH
share/ci/scripts/multi/install_yaml-cpp.sh 0.7.0 $EXT_PATH
share/ci/scripts/multi/install_pystring.sh 1.1.3 $EXT_PATH
share/ci/scripts/multi/install_yaml-cpp.sh 0.8.0 $EXT_PATH
share/ci/scripts/multi/install_pystring.sh 1.1.4 $EXT_PATH
share/ci/scripts/multi/install_pybind11.sh 2.9.2 $EXT_PATH
share/ci/scripts/multi/install_zlib.sh 1.2.12 $EXT_PATH
share/ci/scripts/multi/install_zlib.sh 1.3.1 $EXT_PATH
share/ci/scripts/multi/install_minizip-ng.sh 3.0.6 $EXT_PATH
- name: Install latest ext package versions
run: |
Expand Down Expand Up @@ -211,12 +211,12 @@ jobs:
- name: Install fixed ext package versions
# Minizip-ng depends on ZLIB. ZLIB must be installed first.
run: |
share/ci/scripts/multi/install_expat.sh 2.4.1 $EXT_PATH
share/ci/scripts/multi/install_expat.sh 2.6.0 $EXT_PATH
share/ci/scripts/multi/install_lcms2.sh 2.2 $EXT_PATH
share/ci/scripts/multi/install_yaml-cpp.sh 0.7.0 $EXT_PATH
share/ci/scripts/multi/install_pystring.sh 1.1.3 $EXT_PATH
share/ci/scripts/multi/install_yaml-cpp.sh 0.8.0 $EXT_PATH
share/ci/scripts/multi/install_pystring.sh 1.1.4 $EXT_PATH
share/ci/scripts/multi/install_pybind11.sh 2.9.2 $EXT_PATH
share/ci/scripts/multi/install_zlib.sh 1.2.12 $EXT_PATH
share/ci/scripts/multi/install_zlib.sh 1.3.1 $EXT_PATH
share/ci/scripts/multi/install_minizip-ng.sh 3.0.6 $EXT_PATH
- name: Install latest ext package versions
run: |
Expand Down Expand Up @@ -336,11 +336,11 @@ jobs:
# Minizip-ng depends on ZLIB. ZLIB must be installed first.
run: |
share/ci/scripts/multi/install_lcms2.sh 2.2 $EXT_PATH
share/ci/scripts/multi/install_yaml-cpp.sh 0.7.0 $EXT_PATH
share/ci/scripts/multi/install_pystring.sh 1.1.3 $EXT_PATH
share/ci/scripts/multi/install_yaml-cpp.sh 0.8.0 $EXT_PATH
share/ci/scripts/multi/install_pystring.sh 1.1.4 $EXT_PATH
share/ci/scripts/multi/install_pybind11.sh 2.9.2 $EXT_PATH
share/ci/scripts/multi/install_expat.sh 2.4.1 $EXT_PATH
share/ci/scripts/multi/install_zlib.sh 1.2.12 $EXT_PATH
share/ci/scripts/multi/install_expat.sh 2.6.0 $EXT_PATH
share/ci/scripts/multi/install_zlib.sh 1.3.1 $EXT_PATH
share/ci/scripts/multi/install_minizip-ng.sh 3.0.6 $EXT_PATH
shell: bash
# OSL not installed due to LLVM compilation time.
Expand Down
Loading
Loading