Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions .github/workflows/ci_steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ on:
type: string
validate_install:
type: string
configure_install_prefix:
type: string

permissions:
contents: read
Expand Down Expand Up @@ -229,8 +231,10 @@ jobs:
# Construct the cmake command as a variable, so the
# Configure step below can execute it, but also so we can store
# in in the install_manifest as a debugging reference
# Configure/build with a .tmp install prefix, so we can
# validate the install properly overrides it.
cmake_args=("-B" "$BUILD_DIR" -S "$WORKSPACE")
cmake_args+=("-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR")
cmake_args+=("-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR${{ inputs.configure_install_prefix}}")
cmake_args+=("-DCMAKE_BUILD_TYPE=${{ inputs.build-type }}")
cmake_args+=("-DOPENEXR_CXX_STANDARD=${{ inputs.cxx-standard }}")
cmake_args+=("-DBUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }}")
Expand Down Expand Up @@ -269,22 +273,32 @@ jobs:
echo INSTALL_MANIFEST_FILENAME="install_manifest.${os_name}.${build}.txt" >> $GITHUB_ENV
shell: bash

- name: Configure & Build
- name: Configure, Build, Install
if: inputs.msystem == ''
run: |
set -x
"$CMAKE" --version
"$CMAKE" ${{ env.CMAKE_ARGS }}
"$CMAKE" --build $BUILD_DIR --target install --config ${{ inputs.build-type }}
if [ -n "${{ inputs.configure_install_prefix }}" ]; then
"$CMAKE" --build "$BUILD_DIR" --config ${{ inputs.build-type }}
"$CMAKE" --install "$BUILD_DIR" --prefix "$INSTALL_DIR" --config ${{ inputs.build-type }}
else
"$CMAKE" --build "$BUILD_DIR" --target install --config ${{ inputs.build-type }}
fi
shell: bash

- name: Configure & Build (msys2) # requires msys2 shell
- name: Configure, Build, Install (msys2) # requires msys2 shell
if: inputs.msystem != ''
run: |
set -x
"$CMAKE" --version
"$CMAKE" ${{ env.CMAKE_ARGS }}
"$CMAKE" --build $BUILD_DIR --target install --config ${{ inputs.build-type }}
if [ -n "${{ inputs.configure_install_prefix }}" ]; then
"$CMAKE" --build "$BUILD_DIR" --config ${{ inputs.build-type }}
"$CMAKE" --install "$BUILD_DIR" --prefix "$INSTALL_DIR" --config ${{ inputs.build-type }}
else
"$CMAKE" --build "$BUILD_DIR" --target install --config ${{ inputs.build-type }}
fi
shell: msys2 {0}

- name: Test OpenEXR.pc
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ jobs:
RUN_TESTING: ${{ matrix.RUN_TESTING || 'ON' }}
namespace: ${{ matrix.namespace }}
validate_install: ${{ matrix.validate_install || 'ON' }}
configure_install_prefix: ${{ matrix.configure_install_prefix }}

strategy:
fail-fast: false
Expand Down Expand Up @@ -117,6 +118,8 @@ jobs:
OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
OPENEXR_FORCE_INTERNAL_OPENJPH: 'ON'
BUILD_TESTING: 'OFF'
configure_install_prefix: '.tmp'
cmake: 3.15.7

- build: 6
label: custom namespace
Expand Down Expand Up @@ -187,6 +190,7 @@ jobs:
BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
RUN_TESTING: ${{ matrix.RUN_TESTING || 'ON' }}
validate_install: ${{ matrix.validate_install || 'ON' }}
configure_install_prefix: ${{ matrix.configure_install_prefix }}

strategy:
fail-fast: false
Expand Down Expand Up @@ -218,6 +222,8 @@ jobs:
OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
OPENEXR_FORCE_INTERNAL_OPENJPH: 'ON'
BUILD_TESTING: 'OFF'
configure_install_prefix: '.tmp'
cmake: 3.15.7

- build: 6
label: macos-15-intel
Expand Down Expand Up @@ -271,6 +277,7 @@ jobs:
BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
RUN_TESTING: ${{ matrix.RUN_TESTING || 'ON' }}
validate_install: ${{ matrix.validate_install || 'ON' }}
configure_install_prefix: ${{ matrix.configure_install_prefix }}

strategy:
fail-fast: false
Expand Down Expand Up @@ -302,6 +309,8 @@ jobs:
OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
OPENEXR_FORCE_INTERNAL_OPENJPH: 'ON'
BUILD_TESTING: 'OFF'
configure_install_prefix: '.tmp'
cmake: 3.15.7

- build: 6
label: vfx2023
Expand Down
Loading