Skip to content

Commit

Permalink
namespace
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 18, 2024
1 parent 414ca81 commit 424a441
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
10 changes: 9 additions & 1 deletion .github/workflows/ci_steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ on:
type: string
BUILD_TESTING:
type: string
namespace:
type: string

jobs:
ci_steps:
Expand Down Expand Up @@ -103,6 +105,12 @@ jobs:
-DBUILD_TESTING=${{ inputs.BUILD_TESTING }} \
-DOPENEXR_RUN_FUZZ_TESTS=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON"
if [ -z "${{ inputs.namespace }}" ]; then
CMAKE_COMMAND=$CMAKE_COMMAND \
-DOPENEXR_IMF_NAMESPACE=${{ inputs.namespace }} \
-DILMTHREAD_NAMESPACE=${{ inputs.namespace }} \
-DIEX_NAMESPACE=${{ inputs.namespace }}"
fi
echo "CMAKE_COMMAND=$CMAKE_COMMAND" >> $GITHUB_ENV
# Remove the os version from the manifest name, so it only
Expand Down Expand Up @@ -138,7 +146,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: install_manifest
path: ${{ env.INSTALL_MANIFEST }}
path: _build/${{ env.INSTALL_MANIFEST }}

- name: Validate install
# Validate that the build has installed the proper files by comparing against the appropriate reference manifest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ jobs:
label: vfx2021
vfx-cy: 2021

- build: 9
label: namespace
namespace: XXX
macOS:
name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
uses: ./.github/workflows/ci_steps.yml
Expand All @@ -118,6 +121,7 @@ jobs:
build: ${{ matrix.build }}
cxx-standard: ${{ matrix.cxx-standard || '17' }}
build-type: ${{ matrix.build-type || 'Release' }}
namespace: ${{ matrix.namespace }}
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' }}
Expand Down

0 comments on commit 424a441

Please sign in to comment.