Skip to content

Commit

Permalink
unquote
Browse files Browse the repository at this point in the history 
Signed-off-by: Cary Phillips <[email protected]>
  • Loading branch information
@cary-ilm
cary-ilm committed Nov 21, 2024
1 parent 6ebd228 commit 5b8c907
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 72 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci_steps.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,19 @@ jobs:

- name: Install Imath
# Pre-install Imath so the builds validate finding the external installation
if: ${{ inputs.OPENEXR_FORCE_INTERNAL_IMATH == 'OFF' }}
if: ${{ inputs.OPENEXR_FORCE_INTERNAL_IMATH == OFF }}
run: share/ci/scripts/install_imath.sh main

- name: Install libdeflate
# Pre-install libdeflate so the builds validate finding the external installation
if: ${{ inputs.OPENEXR_FORCE_INTERNAL_DEFLATE == 'OFF' }}
if: ${{ inputs.OPENEXR_FORCE_INTERNAL_DEFLATE == OFF }}
run: share/ci/scripts/install_libdeflate.sh master

- name: Install help2man
# TODO: this could go in the ASWF Linux docker
# container. Also, it doesn't currently work for Windows, so
# the windows builds have docs disabled.
if: ${{ inputs.OPENEXR_INSTALL_DOCS == 'ON' }}
if: ${{ inputs.OPENEXR_INSTALL_DOCS == ON }}
run: share/ci/scripts/install_help2man.sh

- name: Create build directories
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
path: _build/${{ env.INSTALL_MANIFEST }}

- name: Validate install
if: ${{ inputs.validate_install == 'ON' }}
if: ${{ inputs.validate_install == ON }}
# Validate that the build has installed the proper files by comparing against the appropriate reference manifest
run: |
share/ci/scripts/validate_install.py "_build/$INSTALL_MANIFEST" "share/ci/install_manifest/$INSTALL_MANIFEST"
Expand Down
136 changes: 68 additions & 68 deletions .github/workflows/ci_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ jobs:
build: ${{ matrix.build }}
# DockerHub: https://hub.docker.com/u/aswf
# Source: https://github.com/AcademySoftwareFoundation/aswf-docker
container: aswf/ci-openexr:${{ matrix.vfx-cy || '2024' }}
cxx-standard: ${{ matrix.cxx-standard || '17' }}
cxx-compiler: ${{ matrix.cxx-compiler || 'g++' }}
cc-compiler: ${{ matrix.cc-compiler || 'gcc' }}
build-type: ${{ matrix.build-type || 'Release' }}
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_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
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' }}
container: aswf/ci-openexr:${{ matrix.vfx-cy || 2024 }}
cxx-standard: ${{ matrix.cxx-standard || 17 }}
cxx-compiler: ${{ matrix.cxx-compiler || g++ }}
cc-compiler: ${{ matrix.cc-compiler || gcc }}
build-type: ${{ matrix.build-type || Release }}
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_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || ON }}
OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || ON }}
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 }}
namespace: ${{ matrix.namespace }}
validate_install: ${{ matrix.validate_install || 'ON' }}
validate_install: ${{ matrix.validate_install || ON }}
strategy:
matrix:
include:
Expand All @@ -93,21 +93,21 @@ jobs:

- build: 3
label: static
BUILD_SHARED_LIBS: 'OFF'
BUILD_SHARED_LIBS: OFF

- build: 4
label: threads=OFF
OPENEXR_ENABLE_THREADING: 'OFF'
OPENEXR_ENABLE_THREADING: OFF

- build: 5
label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal deflate
OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
OPENEXR_INSTALL_DOCS: 'OFF'
OPENEXR_BUILD_EXAMPLES: 'OFF'
OPENEXR_BUILD_TOOLS: 'OFF'
OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
BUILD_TESTING: 'OFF'
OPENEXR_INSTALL_PKG_CONFIG: OFF
OPENEXR_INSTALL_DOCS: OFF
OPENEXR_BUILD_EXAMPLES: OFF
OPENEXR_BUILD_TOOLS: OFF
OPENEXR_FORCE_INTERNAL_IMATH: ON
OPENEXR_FORCE_INTERNAL_DEFLATE: ON
BUILD_TESTING: OFF

- build: 6
label: custom namespace
Expand Down Expand Up @@ -137,20 +137,20 @@ 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' }}
os: ${{ matrix.os || macos-14 }}
build: ${{ matrix.build }}
cxx-standard: ${{ matrix.cxx-standard || '17' }}
build-type: ${{ matrix.build-type || 'Release' }}
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_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
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' }}
validate_install: ${{ matrix.validate_install || 'ON' }}
cxx-standard: ${{ matrix.cxx-standard || 17 }}
build-type: ${{ matrix.build-type || Release }}
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_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || ON }}
OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || ON }}
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 }}
validate_install: ${{ matrix.validate_install || ON }}
strategy:
matrix:
include:
Expand All @@ -164,21 +164,21 @@ jobs:

- build: 3
label: static
BUILD_SHARED_LIBS: 'OFF'
BUILD_SHARED_LIBS: OFF

- build: 4
label: threads=OFF
OPENEXR_ENABLE_THREADING: 'OFF'
OPENEXR_ENABLE_THREADING: OFF

- build: 5
label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal imath+deflate
OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
OPENEXR_INSTALL_DOCS: 'OFF'
OPENEXR_BUILD_EXAMPLES: 'OFF'
OPENEXR_BUILD_TOOLS: 'OFF'
OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
BUILD_TESTING: 'OFF'
OPENEXR_INSTALL_PKG_CONFIG: OFF
OPENEXR_INSTALL_DOCS: OFF
OPENEXR_BUILD_EXAMPLES: OFF
OPENEXR_BUILD_TOOLS: OFF
OPENEXR_FORCE_INTERNAL_IMATH: ON
OPENEXR_FORCE_INTERNAL_DEFLATE: ON
BUILD_TESTING: OFF

- build: 6
label: macos-13
Expand All @@ -191,20 +191,20 @@ 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' }}
os: ${{ matrix.os || windows-2022 }}
build: ${{ matrix.build }}
cxx-standard: ${{ matrix.cxx-standard || '17' }}
build-type: ${{ matrix.build-type || 'Release' }}
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 || 'OFF' }}
OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
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' }}
validate_install: ${{ matrix.validate_install || 'ON' }}
cxx-standard: ${{ matrix.cxx-standard || 17 }}
build-type: ${{ matrix.build-type || Release }}
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 || OFF }}
OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || ON }}
OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || ON }}
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 }}
validate_install: ${{ matrix.validate_install || ON }}
strategy:
matrix:
include:
Expand All @@ -217,22 +217,22 @@ jobs:

- build: 3
label: static
BUILD_SHARED_LIBS: 'OFF'
BUILD_SHARED_LIBS: OFF

- build: 4
label: threads=OFF
# TODO: this currently fails to compile; switch to OFF once the fix is in.
OPENEXR_ENABLE_THREADING: 'ON'
OPENEXR_ENABLE_THREADING: ON

- build: 5
label: pkgconfig=OFF, examples=OFF, tools=OFF, docs=OFF, internal imath+deflate
OPENEXR_INSTALL_PKG_CONFIG: 'OFF'
OPENEXR_INSTALL_DOCS: 'OFF'
OPENEXR_BUILD_EXAMPLES: 'OFF'
OPENEXR_BUILD_TOOLS: 'OFF'
OPENEXR_FORCE_INTERNAL_IMATH: 'ON'
OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
BUILD_TESTING: 'OFF'
OPENEXR_INSTALL_PKG_CONFIG: OFF
OPENEXR_INSTALL_DOCS: OFF
OPENEXR_BUILD_EXAMPLES: OFF
OPENEXR_BUILD_TOOLS: OFF
OPENEXR_FORCE_INTERNAL_IMATH: ON
OPENEXR_FORCE_INTERNAL_DEFLATE: ON
BUILD_TESTING: OFF

- build: 6
label: vfx2022
Expand Down

0 comments on commit 5b8c907

Please sign in to comment.