From c73afeb1c3ccc0704f923b60d43ea521be8b1aeb Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Wed, 20 May 2026 20:15:12 -0400 Subject: [PATCH 1/2] Fix 2023.3 Linux container break Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 2d6ba3a12..982942b7a 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -59,7 +59,7 @@ jobs: # Source: https://github.com/AcademySoftwareFoundation/aswf-docker image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: - fail-fast: true + fail-fast: false matrix: build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] include: @@ -203,7 +203,7 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - vfx-cy: 2023 + vfx-cy: 2023.2 install-ext-packages: MISSING - build: 2 build-type: Release @@ -216,7 +216,7 @@ jobs: cxx-compiler: g++ cc-compiler: gcc compiler-desc: GCC - vfx-cy: 2023 + vfx-cy: 2023.2 install-ext-packages: ALL - build: 1 build-type: Release @@ -229,7 +229,7 @@ jobs: cxx-compiler: g++ cc-compiler: gcc compiler-desc: GCC - vfx-cy: 2023 + vfx-cy: 2023.2 install-ext-packages: ALL env: CXX: ${{ matrix.cxx-compiler }} From 4feef9b8cef0176cf2032f9f14c61110646ba687 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Wed, 20 May 2026 21:02:22 -0400 Subject: [PATCH 2/2] Adjust to keep the name constant to use the existing GitHub branch rules Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 982942b7a..41c7afb08 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -57,7 +57,7 @@ jobs: container: # DockerHub: https://hub.docker.com/u/aswf # Source: https://github.com/AcademySoftwareFoundation/aswf-docker - image: aswf/ci-ocio:${{ matrix.vfx-cy }} + image: aswf/ci-ocio:${{ matrix.container-tag || matrix.vfx-cy }} strategy: fail-fast: false matrix: @@ -203,7 +203,8 @@ jobs: cxx-compiler: clang++ cc-compiler: clang compiler-desc: Clang - vfx-cy: 2023.2 + vfx-cy: 2023 + container-tag: 2023.2 install-ext-packages: MISSING - build: 2 build-type: Release @@ -216,7 +217,8 @@ jobs: cxx-compiler: g++ cc-compiler: gcc compiler-desc: GCC - vfx-cy: 2023.2 + vfx-cy: 2023 + container-tag: 2023.2 install-ext-packages: ALL - build: 1 build-type: Release @@ -229,7 +231,8 @@ jobs: cxx-compiler: g++ cc-compiler: gcc compiler-desc: GCC - vfx-cy: 2023.2 + vfx-cy: 2023 + container-tag: 2023.2 install-ext-packages: ALL env: CXX: ${{ matrix.cxx-compiler }}