full

Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Nov 15, 2024 · 94c14cc · 94c14cc
1 parent 4a9d748
commit 94c14cc
Show file tree

Hide file tree

Showing 2 changed files with 162 additions and 150 deletions.
diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml
@@ -115,20 +115,12 @@ jobs:
         working-directory: _build
         shell: bash
 
-      - name: Set PATH for Imath DLLs
+      - name: Set PATH for Imath/libdeflate DLLs
+        if: contains(inputs.os, 'windows')
         run: |
           echo "$PATH;C:/Program Files (x86)/Imath/bin;C:/Program Files (x86)/Imath/lib;C:/Program Files (x86)/libdeflate/bin;C:/Program Files (x86)/libdeflate/lib" >> $GITHUB_PATH
         shell: bash
 
-      - name: Test PATH
-        run: |
-          echo "PATH: $PATH"
-        shell: bash
-
-      - name: Test Examples
-        run: D:/a/openexr/openexr/_build/bin/Release/OpenEXRExamples.exe
-        shell: bash
-
       - name: Test
         run: |
           ctest -T Test -C ${{ inputs.build-type }} --timeout 7200 --output-on-failure -VV

diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -43,146 +43,140 @@ permissions:
   contents: read
 
 jobs:
-# linux:
-#   name: 'Linux.${{ matrix.build}}: ${{ matrix.label }}'
-#   uses: ./.github/workflows/ci_steps.yml
-#   with:
-#     # Set values for the "inputs:" as defined in ci_steps.yml
-#     # Note the defaults provided here for the builds that don't specify
-#     # values.
-#     os: ubuntu-latest
-#     container: 'aswf/ci-openexr:${{ matrix.vfx-cy }}'
-#     vfx-cy: ${{ matrix.vfx-cy || '2024' }}
-#     compiler-desc: ${{ matrix.compiler-desc || 'gcc11.2.1' }}
-#     cxx-compiler: ${{ matrix.cxx-compiler || 'g++' }}
-#     cc-compiler: ${{ matrix.cc-compiler || 'gcc' }}
-#     cxx-standard: ${{ matrix.cxx-standard || '17' }}
-#     build-type: ${{ matrix.build-type || 'Release' }}
-#     BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
-#     OPENEXR_ENABLE_THREADING: ${{ matrix.OPENEXR_ENABLE_THREADING || 'ON' }}
-#     OPENEXR_INSTALL_PKG_CONFIG: ${{ matrix.OPENEXR_INSTALL_PKG_CONFIG || 'ON' }}
-#     OPENEXR_INSTALL_DOCS: ${{ matrix.OPENEXR_INSTALL_DOCS || 'ON' }}
-#     OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
-#     OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
-#     OPENEXR_BUILD_PYTHON: ${{ matrix.OPENEXR_BUILD_PYTHON || 'OFF' }}
-#     OPENEXR_FORCE_INTERNAL_IMATH: ${{ matrix.OPENEXR_FORCE_INTERNAL_IMATH || 'OFF' }}
-#     OPENEXR_FORCE_INTERNAL_DEFLATE: ${{ matrix.OPENEXR_FORCE_INTERNAL_DEFLATE || 'OFF' }}
-#     BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
-#   strategy:
-#     matrix:
-#       include:
-
-#         - build: 1
-#           label: Debug
-#           build-type: Debug
-
-#         - build: 2
-#           label: Release
-
-#         - build: 3
-#           label: Static
-#           BUILD_SHARED_LIBS: 'OFF'
-
-#         - build: 4
-#           label: threads=OFF
-#           OPENEXR_ENABLE_THREADING: 'OFF'
-
-#         - build: 5
-#           label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal deflate
-#           OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
-#           OPENEXR_INSTALL_DOCS: 'OFF'
-#           OPENEXR_BUILD_EXAMPLES: 'OFF'
-#           OPENEXR_BUILD_TOOLS: 'OFF'
-#           OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
-#           OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
-#           BUILD_TESTING: 'OFF'
-
-#         - build: 6
-#           label: clang15.0
-#           compiler-desc: clang15.0
-#           cxx-compiler: clang++
-#           cc-compiler: clang
-
-#         - build: 7
-#           label: clang14.0
-#           compiler-desc: clang14.0
-#           cxx-compiler: clang++
-#           cc-compiler: clang
-
-#         - build: 8
-#           label: vfx2023
-#           vfx-cy: 2023
-
-#         - build: 9
-#           label: vfx2022
-#           vfx-cy: 2022
-#           compiler-desc: gcc9.3.1
-
-#         - build: 10
-#           label: vfx2021
-#           vfx-cy: 2021
-#           compiler-desc: gcc9.3.1
-
-# macOS:
-#   name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
-#   uses: ./.github/workflows/ci_steps.yml
-#   with:
-#     # Set values for the "inputs:" as defined in ci_steps.yml
-#     # Note the defaults provided here for the builds that don't specify
-#     # values.
-#     os: ${{ matrix.os || 'macos-14' }}
-#     vfx-cy: ${{ matrix.vfx-cy || '2024' }}
-#     compiler-desc: ${{ matrix.compiler-desc || 'AppleClang11.0' }}
-#     cxx-compiler: ${{ matrix.cxx-compiler || 'clang++' }}
-#     cc-compiler: ${{ matrix.cc-compiler || 'clang' }}
-#     cxx-standard: ${{ matrix.cxx-standard || '17' }}
-#     build-type: ${{ matrix.build-type || 'Release' }}
-#     BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
-#     OPENEXR_ENABLE_THREADING: ${{ matrix.OPENEXR_ENABLE_THREADING || 'ON' }}
-#     OPENEXR_INSTALL_PKG_CONFIG: ${{ matrix.OPENEXR_INSTALL_PKG_CONFIG || 'ON' }}
-#     OPENEXR_INSTALL_DOCS: ${{ matrix.OPENEXR_INSTALL_DOCS || 'ON' }}
-#     OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
-#     OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
-#     OPENEXR_BUILD_PYTHON: ${{ matrix.OPENEXR_BUILD_PYTHON || 'OFF' }}
-#     OPENEXR_FORCE_INTERNAL_IMATH: ${{ matrix.OPENEXR_FORCE_INTERNAL_IMATH || 'OFF' }}
-#     OPENEXR_FORCE_INTERNAL_DEFLATE: ${{ matrix.OPENEXR_FORCE_INTERNAL_DEFLATE || 'OFF' }}
-#     BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
-#   strategy:
-#     matrix:
-#       include:
-
-#         - build: 1
-#           label: Debug
-#           build-type: Debug
-
-#         - build: 2
-#           label: Release
+ linux:
+   name: 'Linux.${{ matrix.build}}: ${{ matrix.label }}'
+   uses: ./.github/workflows/ci_steps.yml
+   with:
+     # Set values for the "inputs:" as defined in ci_steps.yml
+     # Note the defaults provided here for the builds that don't specify
+     # values.
+     os: ubuntu-latest
+     container: 'aswf/ci-openexr:${{ matrix.vfx-cy }}'
+     vfx-cy: ${{ matrix.vfx-cy || '2024' }}
+     cxx-compiler: ${{ matrix.cxx-compiler || 'g++' }}
+     cc-compiler: ${{ matrix.cc-compiler || 'gcc' }}
+     cxx-standard: ${{ matrix.cxx-standard || '17' }}
+     build-type: ${{ matrix.build-type || 'Release' }}
+     BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
+     OPENEXR_ENABLE_THREADING: ${{ matrix.OPENEXR_ENABLE_THREADING || 'ON' }}
+     OPENEXR_INSTALL_PKG_CONFIG: ${{ matrix.OPENEXR_INSTALL_PKG_CONFIG || 'ON' }}
+     OPENEXR_INSTALL_DOCS: ${{ matrix.OPENEXR_INSTALL_DOCS || 'ON' }}
+     OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
+     OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
+     OPENEXR_BUILD_PYTHON: ${{ matrix.OPENEXR_BUILD_PYTHON || 'OFF' }}
+     OPENEXR_FORCE_INTERNAL_IMATH: ${{ matrix.OPENEXR_FORCE_INTERNAL_IMATH || 'OFF' }}
+     OPENEXR_FORCE_INTERNAL_DEFLATE: ${{ matrix.OPENEXR_FORCE_INTERNAL_DEFLATE || 'OFF' }}
+     BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
+   strategy:
+     matrix:
+       include:
+
+         - build: 1
+           label: Debug
+           build-type: Debug
+
+         - build: 2
+           label: Release
+
+         - build: 3
+           label: Static
+           BUILD_SHARED_LIBS: 'OFF'
+
+         - build: 4
+           label: threads=OFF
+           OPENEXR_ENABLE_THREADING: 'OFF'
+
+         - build: 5
+           label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal deflate
+           OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
+           OPENEXR_INSTALL_DOCS: 'OFF'
+           OPENEXR_BUILD_EXAMPLES: 'OFF'
+           OPENEXR_BUILD_TOOLS: 'OFF'
+           OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
+           OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
+           BUILD_TESTING: 'OFF'
+
+         - build: 6
+           label: clang15.0
+           cxx-compiler: clang++
+           cc-compiler: clang
+
+         - build: 7
+           label: clang14.0
+           cxx-compiler: clang++
+           cc-compiler: clang
+
+         - build: 8
+           label: vfx2023
+           vfx-cy: 2023
+
+         - build: 9
+           label: vfx2022
+           vfx-cy: 2022
+
+         - build: 10
+           label: vfx2021
+           vfx-cy: 2021
+
+ macOS:
+   name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
+   uses: ./.github/workflows/ci_steps.yml
+   with:
+     # Set values for the "inputs:" as defined in ci_steps.yml
+     # Note the defaults provided here for the builds that don't specify
+     # values.
+     os: ${{ matrix.os || 'macos-14' }}
+     vfx-cy: ${{ matrix.vfx-cy || '2024' }}
+     cxx-compiler: ${{ matrix.cxx-compiler || 'clang++' }}
+     cc-compiler: ${{ matrix.cc-compiler || 'clang' }}
+     cxx-standard: ${{ matrix.cxx-standard || '17' }}
+     build-type: ${{ matrix.build-type || 'Release' }}
+     BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
+     OPENEXR_ENABLE_THREADING: ${{ matrix.OPENEXR_ENABLE_THREADING || 'ON' }}
+     OPENEXR_INSTALL_PKG_CONFIG: ${{ matrix.OPENEXR_INSTALL_PKG_CONFIG || 'ON' }}
+     OPENEXR_INSTALL_DOCS: ${{ matrix.OPENEXR_INSTALL_DOCS || 'ON' }}
+     OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
+     OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
+     OPENEXR_BUILD_PYTHON: ${{ matrix.OPENEXR_BUILD_PYTHON || 'OFF' }}
+     OPENEXR_FORCE_INTERNAL_IMATH: ${{ matrix.OPENEXR_FORCE_INTERNAL_IMATH || 'OFF' }}
+     OPENEXR_FORCE_INTERNAL_DEFLATE: ${{ matrix.OPENEXR_FORCE_INTERNAL_DEFLATE || 'OFF' }}
+     BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
+   strategy:
+     matrix:
+       include:
+
+         - build: 1
+           label: Debug
+           build-type: Debug
+
+         - build: 2
+           label: Release
 
-#         - build: 3
-#           label: Static
-#           BUILD_SHARED_LIBS: 'OFF'
-
-#         - build: 4
-#           label: threads=OFF
-#           OPENEXR_ENABLE_THREADING: 'OFF'
-
-#         - build: 5
-#           label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal imath+deflate
-#           OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
-#           OPENEXR_INSTALL_DOCS: 'OFF'
-#           OPENEXR_BUILD_EXAMPLES: 'OFF'
-#           OPENEXR_BUILD_TOOLS: 'OFF'
-#           OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
-#           OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
-#           BUILD_TESTING: 'OFF'
-
-#         - build: 6
-#           label: macos-13
-#           os: macos-13
-
-#         - build: 7
-#           label: macos-12
-#           os: macos-12
+         - build: 3
+           label: Static
+           BUILD_SHARED_LIBS: 'OFF'
+
+         - build: 4
+           label: threads=OFF
+           OPENEXR_ENABLE_THREADING: 'OFF'
+
+         - build: 5
+           label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal imath+deflate
+           OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
+           OPENEXR_INSTALL_DOCS: 'OFF'
+           OPENEXR_BUILD_EXAMPLES: 'OFF'
+           OPENEXR_BUILD_TOOLS: 'OFF'
+           OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
+           OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
+           BUILD_TESTING: 'OFF'
+
+         - build: 6
+           label: macos-13
+           os: macos-13
+
+         - build: 7
+           label: macos-12
+           os: macos-12
 
   windows:
     name: 'Windows.${{ matrix.build}}: ${{ matrix.label }}'
@@ -193,7 +187,6 @@ jobs:
       # values.
       os: windows-2022
       vfx-cy: ${{ matrix.vfx-cy || '2024' }}
-      compiler-desc: ${{ matrix.compiler-desc || 'msvc17.5' }}
       cxx-compiler: ${{ matrix.cxx-compiler }}
       cc-compiler: ${{ matrix.cc-compiler }}
       cxx-standard: ${{ matrix.cxx-standard || '17' }}
@@ -212,4 +205,31 @@ jobs:
       matrix:
         include:
           - build: 1
+            build-type: Debug
+            label: Debug
+
+          - build: 2
             label: Release
+
+         - build: 3
+           label: Static
+           BUILD_SHARED_LIBS: 'OFF'
+
+         - build: 4
+           label: threads=OFF
+           OPENEXR_ENABLE_THREADING: 'OFF'
+
+         - build: 5
+           label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal imath+deflate
+           OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
+           OPENEXR_INSTALL_DOCS: 'OFF'
+           OPENEXR_BUILD_EXAMPLES: 'OFF'
+           OPENEXR_BUILD_TOOLS: 'OFF'
+           OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
+           OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
+           BUILD_TESTING: 'OFF'
+
+         - build: 6
+           label: windows-2019
+           os: windows-2019
+