runner

Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Nov 17, 2024 · aa95c9c · aa95c9c
1 parent 8ee845f
commit aa95c9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml
@@ -13,10 +13,6 @@ on:
     inputs:
       os:
         type: string
-      container:
-        type: string
-      vfx-cy:
-        type: string
       cxx-compiler:
         type: string
       cc-compiler:
@@ -46,7 +42,7 @@ on:
 
 jobs:
   ci_steps:
-    runs-on: ${{ inputs.os }}
+#    runs-on: ${{ inputs.os }}
 
     env:
       CXX: ${{ inputs.cxx-compiler }}
@@ -103,6 +99,7 @@ jobs:
         shell: bash
 
       - name: Build
+        if: false
         run: |
           cmake --build . \
                 --target install \
@@ -111,12 +108,13 @@ jobs:
         shell: bash
 
       - name: Set PATH for Imath/libdeflate DLLs
-        if: contains(inputs.os, 'windows')
+        if: contains(runner.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
+        if: false
         run: |
           ctest -T Test -C ${{ inputs.build-type }} --timeout 7200 --output-on-failure -VV
         working-directory: _build

diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -46,11 +46,12 @@ jobs:
   linux:
     name: 'Linux.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
+    runs-on: ubuntu-latest
     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
+#      os: ubuntu-latest
       container: aswf/ci-openexr:${{ matrix.vfx-cy || '2024' }}
       cxx-compiler: ${{ matrix.cxx-compiler || 'g++' }}
       cc-compiler: ${{ matrix.cc-compiler || 'gcc' }}
@@ -65,7 +66,7 @@ jobs:
       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:
+     strategy:
       matrix:
         include:
 
@@ -119,11 +120,12 @@ jobs:
   macOS:
     name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
+    runs-on: ${{ matrix.os || 'macos-14' }}
     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' }}
+#      os: ${{ matrix.os || 'macos-14' }}
       cxx-compiler: ${{ matrix.cxx-compiler || 'clang++' }}
       cc-compiler: ${{ matrix.cc-compiler || 'clang' }}
       cxx-standard: ${{ matrix.cxx-standard || '17' }}
@@ -177,11 +179,12 @@ jobs:
   windows:
     name: 'Windows.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
+    runs-on: ${{ matrix.os || 'windows-2022' }}
     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 || 'windows-2022' }}
+#      os: ${{ matrix.os || 'windows-2022' }}
       cxx-standard: ${{ matrix.cxx-standard || '17' }}
       build-type: ${{ matrix.build-type || 'Release' }}
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}