Skip to content

Commit

Permalink
Fix GHA CI after they upgraded nodejs (#1779)
Browse files Browse the repository at this point in the history
They upgraded to a version that requires a glibc newer than is in the
pre-2023 ASWF containers.

See AcademySoftwareFoundation/OpenImageIO#4324

The example build is failing, but it turns out the ci build step
duplicates what happens in the validate_openexr_libs.sh script anyway,
so I'm removing it from the workflow.

Signed-off-by: Cary Phillips <[email protected]>
  • Loading branch information
cary-ilm authored Jul 24, 2024
1 parent 8169016 commit faf697f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
21 changes: 3 additions & 18 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ jobs:
env:
CXX: ${{ matrix.cxx-compiler }}
CC: ${{ matrix.cc-compiler }}
ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
steps:
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
Expand All @@ -230,8 +232,6 @@ jobs:
mkdir _install
mkdir _build
mkdir _examples
- name: Install help2man
run: yum install -y help2man
- name: Configure
run: |
cmake -B _build -S . \
Expand All @@ -242,7 +242,7 @@ jobs:
-DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
-DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-DOPENEXR_INSTALL_TOOLS='ON' \
-DOPENEXR_INSTALL_DOCS='ON' \
-DOPENEXR_INSTALL_DOCS='OFF' \
-DOPENEXR_RUN_FUZZ_TESTS='OFF' \
-DOPENEXR_ENABLE_THREADING=${{ matrix.threads-enabled }}
- name: Build
Expand All @@ -253,21 +253,6 @@ jobs:
- name: Validate
run: |
share/ci/scripts/linux/validate_openexr_libs.sh _install
- name: Examples
run: |
# Make sure we can build the examples when configured as a
# standalone application linking against the just-installed
# OpenEXR library.
cmake ../src/examples \
-DCMAKE_PREFIX_PATH=../../_install \
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
-DCMAKE_CXX_STANDARD=${{ matrix.cxx-standard }} \
-DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }}
cmake --build . \
--config ${{ matrix.build-type }}
# Confirm the examples program runs
./bin/OpenEXRExamples
working-directory: _examples
- name: Test
run: |
ctest -T Test ${{ matrix.exclude-tests }} \
Expand Down
6 changes: 5 additions & 1 deletion share/ci/scripts/linux/validate_openexr_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ fi
set -x

BUILD_ROOT=$1
SRC_ROOT=$2
if [[ $# == "2" ]]; then
SRC_ROOT=$2
else
SRC_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../../.."
fi

# Locate OpenEXR.pc and set PKG_CONFIG_PATH accordingly

Expand Down

0 comments on commit faf697f

Please sign in to comment.