Add VFX Platform 2023 to CI build matrix (#1813)

* Add ci-ocio:2023 to build matrix Signed-off-by: Rémi Achard <[email protected]> * Fix OpenImageIO detection Signed-off-by: Rémi Achard <[email protected]> * Update deprecated GHA Signed-off-by: Rémi Achard <[email protected]> --------- Signed-off-by: Rémi Achard <[email protected]> Co-authored-by: Doug Walker <[email protected]>
AcademySoftwareFoundation · Jul 28, 2023 · f26df74 · f26df74
1 parent 93ee2cc
commit f26df74
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 5 deletions.
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -60,9 +60,48 @@ jobs:
       image: aswf/ci-ocio:${{ matrix.vfx-cy }}
     strategy:
       matrix:
-        build: [1, 2, 3, 4, 5, 6, 7, 8, 9]
+        build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
         include:
           # -------------------------------------------------------------------
+          # VFX CY2023 (Python 3.10)
+          # -------------------------------------------------------------------
+          - build: 12
+            build-type: Debug
+            build-shared: 'ON'
+            build-docs: 'OFF'
+            build-openfx: 'ON'
+            use-sse: 'ON'
+            use-oiio: 'ON'
+            cxx-standard: 17
+            cxx-compiler: clang++
+            cc-compiler: clang
+            compiler-desc: Clang
+            vfx-cy: 2023
+          - build: 11
+            build-type: Release
+            build-shared: 'ON'
+            build-docs: 'ON'
+            build-openfx: 'ON'
+            use-sse: 'OFF'
+            use-oiio: 'OFF'
+            cxx-standard: 17
+            cxx-compiler: g++
+            cc-compiler: gcc
+            compiler-desc: GCC
+            vfx-cy: 2023
+          - build: 10
+            build-type: Release
+            build-shared: 'OFF'
+            build-docs: 'OFF'
+            build-openfx: 'OFF'
+            use-sse: 'ON'
+            use-oiio: 'OFF'
+            cxx-standard: 11
+            cxx-compiler: g++
+            cc-compiler: gcc
+            compiler-desc: GCC
+            vfx-cy: 2023
+          # -------------------------------------------------------------------
           # VFX CY2022 (Python 3.9)
           # -------------------------------------------------------------------
           - build: 9

diff --git a/.github/workflows/gpu_workflow.yml b/.github/workflows/gpu_workflow.yml
@@ -16,6 +16,8 @@ on:
     tags-ignore:
       - v0.*
       - v1.*
+    paths:
+      - .github/workflows/gpu_workflow.yml
 
 jobs:
   # ---------------------------------------------------------------------------
@@ -33,13 +35,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.CODEBUILD_ID }}
           aws-secret-access-key: ${{ secrets.CODEBUILD_SECRET }}
           aws-region: us-west-2
       - name: Run CodeBuild
-        uses: aws-actions/aws-codebuild-run-project@v1.0.0
+        uses: aws-actions/aws-codebuild-run-build@v1
         with:
           project-name: OpenColorIO
           buildspec-override: buildspec.yml
diff --git a/share/cmake/macros/ocio_check_dependency_version.cmake b/share/cmake/macros/ocio_check_dependency_version.cmake
@@ -29,9 +29,9 @@ function (ocio_check_dependency_version dep_name output)
         find_package(${dep_name} ${ocio_cdv_UNPARSED_ARGUMENTS})
         if (ocio_cdv_MIN_VERSION AND ${dep_name}_VERSION)
             if (${${dep_name}_VERSION} VERSION_GREATER_EQUAL ocio_cdv_MIN_VERSION)
-                set(${output} TRUE)
+                set(${output} TRUE PARENT_SCOPE)
             else()
-                set(${output} FALSE)
+                set(${output} FALSE PARENT_SCOPE)
             endif()
         endif()
     endif()