From e3d94fc8b9b4a82289e7e1e4afd7ddf8ca3bb984 Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Tue, 23 Jul 2024 18:00:21 -0700 Subject: [PATCH] Fix GHA CI after they upgraded nodejs They upgraded to a version that requires a glibc newer than is in the pre-2023 ASWF containers. See https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/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 --- .github/workflows/ci_workflow.yml | 21 +++---------------- .../ci/scripts/linux/validate_openexr_libs.sh | 6 +++++- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index dc6b67f3bf..e775a9fb92 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -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 @@ -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 . \ @@ -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 @@ -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 }} \ diff --git a/share/ci/scripts/linux/validate_openexr_libs.sh b/share/ci/scripts/linux/validate_openexr_libs.sh index d8bfe7ac52..967a7fa179 100755 --- a/share/ci/scripts/linux/validate_openexr_libs.sh +++ b/share/ci/scripts/linux/validate_openexr_libs.sh @@ -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