From 78f68a2c91563bead4816fcbab86b90c5c061898 Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Sun, 17 Nov 2024 15:47:48 -0800 Subject: [PATCH] runs-on Signed-off-by: Cary Phillips --- .github/workflows/ci_steps.yml | 3 --- .github/workflows/ci_workflow.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml index 94cfc0e17..6fea2c4ae 100644 --- a/.github/workflows/ci_steps.yml +++ b/.github/workflows/ci_steps.yml @@ -11,8 +11,6 @@ on: workflow_call: # This inputs receive values via the "with:" section in ci_workflow.yml inputs: - os: - type: string cxx-compiler: type: string cc-compiler: @@ -42,7 +40,6 @@ on: jobs: ci_steps: -# runs-on: ${{ inputs.os }} env: CXX: ${{ inputs.cxx-compiler }} diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 05913770c..a682b40c1 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -51,7 +51,6 @@ jobs: # 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 || '2024' }} cxx-compiler: ${{ matrix.cxx-compiler || 'g++' }} cc-compiler: ${{ matrix.cc-compiler || 'gcc' }} @@ -125,7 +124,6 @@ jobs: # 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' }} cxx-compiler: ${{ matrix.cxx-compiler || 'clang++' }} cc-compiler: ${{ matrix.cc-compiler || 'clang' }} cxx-standard: ${{ matrix.cxx-standard || '17' }} @@ -184,7 +182,6 @@ jobs: # 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' }} cxx-standard: ${{ matrix.cxx-standard || '17' }} build-type: ${{ matrix.build-type || 'Release' }} BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}