Skip to content

Commit

Permalink
draft3
Browse files Browse the repository at this point in the history
Signed-off-by: Cary Phillips <[email protected]>
  • Loading branch information
cary-ilm committed Nov 11, 2024
1 parent 31783b6 commit 5e7d36d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ci_steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ jobs:
- name: Checkout
uses: actions/[email protected]

- name: Install Dependencies
run: |
share/ci/scripts/install_imath.sh main
share/ci/scripts/install_libdeflate.sh master
share/ci/scripts/install_help2man.sh
shell: bash

- name: Create build directories
run: |
mkdir _install
Expand All @@ -61,7 +68,6 @@ jobs:
-DCMAKE_INSTALL_PREFIX=_install \
-DCMAKE_BUILD_TYPE=${{ inputs.build-type }} \
-DOPENEXR_CXX_STANDARD=${{ inputs.cxx-standard }} \
-DCMAKE_CXX_FLAGS='${{ inputs.cxx-flags }}' \
-DBUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }} \
-DOPENEXR_ENABLE_THREADING=${{ inputs.OPENEXR_ENABLE_THREADING }} \
-DOPENEXR_INSTALL_PKG_CONFIG=${{ inputs.OPENEXR_INSTALL_PKG_CONFIG }} \
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
name: 'macOS ${{ matrix.build}}: ${{ matrix.label }}'
uses: ./.github/workflows/ci_steps.yml
with:
os: ${{ matrix.os }}
os: ${{ matrix.os || 'macos-14' }}
vfx-cy: ${{ matrix.vfx-cy || '2024' }}
compiler-desc: ${{ matrix.compiler-desc || 'AppleClang11.0' }}
cxx-compiler: ${{ matrix.cxx-compiler }}
Expand All @@ -150,7 +150,7 @@ jobs:

- build: 2
label: Release

- build: 3
label: Static
BUILD_SHARED_LIBS: 'OFF'
Expand All @@ -169,6 +169,15 @@ jobs:
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 }}'
uses: ./.github/workflows/ci_steps.yml
Expand All @@ -183,7 +192,7 @@ jobs:
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_INSTALL_DOCS: ${{ matrix.OPENEXR_INSTALL_DOCS || 'OFF' }}
OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
OPENEXR_BUILD_PYTHON: ${{ matrix.OPENEXR_BUILD_PYTHON || 'OFF' }}
Expand All @@ -199,7 +208,6 @@ jobs:

- build: 2
label: Release
build-type: Debug



0 comments on commit 5e7d36d

Please sign in to comment.