From 24c44d084b2881f71b13956f3d7de5cce9199c42 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Sat, 6 Jul 2024 18:33:01 -0400 Subject: [PATCH 1/9] Fix for node.js glibc issue Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 3eb0008998..cc5322ef19 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -233,6 +233,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@v3 From 287fcd05cb779342bb830dd4965f80866b65447e Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Sat, 6 Jul 2024 18:49:39 -0400 Subject: [PATCH 2/9] Temporarily turn off Linux docs builds Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index cc5322ef19..854d90e8cd 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -60,7 +60,9 @@ jobs: image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: matrix: - build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] +# build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + # Temporarily turn off docs builds. + build: [1, 2, 3, 4, 5, 6, 7, 9, 10, 12] include: # ------------------------------------------------------------------- # VFX CY2023 (Python 3.10) From 2b3f4ecf43efe25c14dd6cd945a5920597382a85 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Sat, 6 Jul 2024 18:56:28 -0400 Subject: [PATCH 3/9] Temporarily turn off Linux docs builds, 2nd try Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 854d90e8cd..8612f994fb 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -60,9 +60,7 @@ jobs: image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: matrix: -# build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - # Temporarily turn off docs builds. - build: [1, 2, 3, 4, 5, 6, 7, 9, 10, 12] + build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] include: # ------------------------------------------------------------------- # VFX CY2023 (Python 3.10) @@ -83,7 +81,8 @@ jobs: - build: 11 build-type: Release build-shared: 'ON' - build-docs: 'ON' + build-docs: 'OFF' +# build-docs: 'ON' build-openfx: 'ON' use-simd: 'OFF' use-oiio: 'OFF' @@ -125,7 +124,8 @@ jobs: - build: 8 build-type: Release build-shared: 'ON' - build-docs: 'ON' + build-docs: 'OFF' +# build-docs: 'ON' build-openfx: 'ON' use-simd: 'OFF' use-oiio: 'OFF' From 657952091e4f7c2f90c04af62fd96db37201879e Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Sun, 7 Jul 2024 14:50:45 -0400 Subject: [PATCH 4/9] Update macOS runner from 11 to 12 Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 8612f994fb..ce6766faef 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -320,7 +320,7 @@ jobs: # --------------------------------------------------------------------------- macos: - name: 'macOS 11 + name: 'macOS 12 Date: Sun, 7 Jul 2024 15:16:43 -0400 Subject: [PATCH 5/9] Attempt docs install fix Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 4 ++-- share/ci/scripts/linux/yum/install_doxygen.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index ce6766faef..3d8b0fa966 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -81,8 +81,8 @@ jobs: - build: 11 build-type: Release build-shared: 'ON' - build-docs: 'OFF' -# build-docs: 'ON' +# build-docs: 'OFF' + build-docs: 'ON' build-openfx: 'ON' use-simd: 'OFF' use-oiio: 'OFF' diff --git a/share/ci/scripts/linux/yum/install_doxygen.sh b/share/ci/scripts/linux/yum/install_doxygen.sh index d51d2611fe..04b8661447 100755 --- a/share/ci/scripts/linux/yum/install_doxygen.sh +++ b/share/ci/scripts/linux/yum/install_doxygen.sh @@ -7,7 +7,11 @@ set -ex DOXYGEN_VERSION="$1" if [ "$DOXYGEN_VERSION" == "latest" ]; then + yum repolist + yum --disablerepo=mirrorlist.centos.org yum install -y doxygen else + yum repolist + yum --disablerepo=mirrorlist.centos.org yum install -y doxygen-${DOXYGEN_VERSION} fi From 78e4826ecc0234c5b3145a077df68b73ea687457 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Sun, 7 Jul 2024 16:10:12 -0400 Subject: [PATCH 6/9] Another docs fix attempt, and add 2024 container Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 22 +++++++++++++++---- .../ci/scripts/linux/yum/install_docs_env.sh | 6 ++++- share/ci/scripts/linux/yum/install_doxygen.sh | 4 ---- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 3d8b0fa966..6ac6a703ea 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -60,11 +60,27 @@ jobs: image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: matrix: - build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] include: # ------------------------------------------------------------------- # VFX CY2023 (Python 3.10) # ------------------------------------------------------------------- + - build: 13 + build-type: Debug + build-shared: 'ON' + build-docs: 'OFF' + build-openfx: 'OFF' + use-simd: 'ON' + use-oiio: 'OFF' + cxx-standard: 17 + cxx-compiler: clang++ + cc-compiler: clang + compiler-desc: Clang + vfx-cy: 2024 + install-ext-packages: MISSING + # ------------------------------------------------------------------- + # VFX CY2023 (Python 3.10) + # ------------------------------------------------------------------- - build: 12 build-type: Debug build-shared: 'ON' @@ -81,7 +97,6 @@ jobs: - build: 11 build-type: Release build-shared: 'ON' -# build-docs: 'OFF' build-docs: 'ON' build-openfx: 'ON' use-simd: 'OFF' @@ -124,8 +139,7 @@ jobs: - build: 8 build-type: Release build-shared: 'ON' - build-docs: 'OFF' -# build-docs: 'ON' + build-docs: 'ON' build-openfx: 'ON' use-simd: 'OFF' use-oiio: 'OFF' diff --git a/share/ci/scripts/linux/yum/install_docs_env.sh b/share/ci/scripts/linux/yum/install_docs_env.sh index 6460204155..0a009590ba 100755 --- a/share/ci/scripts/linux/yum/install_docs_env.sh +++ b/share/ci/scripts/linux/yum/install_docs_env.sh @@ -6,5 +6,9 @@ set -ex HERE=$(dirname $0) -bash $HERE/install_doxygen.sh latest +# The yum install doxygen command started failing since mirrorlist.centos.org +# was turned off. However, it seems that Doxygen is already installed on our containers +# so this command is not currently necessary: +# bash $HERE/install_doxygen.sh latest + pip install -r $HERE/../../../../../docs/requirements.txt diff --git a/share/ci/scripts/linux/yum/install_doxygen.sh b/share/ci/scripts/linux/yum/install_doxygen.sh index 04b8661447..d51d2611fe 100755 --- a/share/ci/scripts/linux/yum/install_doxygen.sh +++ b/share/ci/scripts/linux/yum/install_doxygen.sh @@ -7,11 +7,7 @@ set -ex DOXYGEN_VERSION="$1" if [ "$DOXYGEN_VERSION" == "latest" ]; then - yum repolist - yum --disablerepo=mirrorlist.centos.org yum install -y doxygen else - yum repolist - yum --disablerepo=mirrorlist.centos.org yum install -y doxygen-${DOXYGEN_VERSION} fi From 98fe994deaac534e0128b16ecd0cd60e20873781 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Sun, 7 Jul 2024 16:28:13 -0400 Subject: [PATCH 7/9] Remove 2024 container test Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 6ac6a703ea..ff21f7b9b3 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -60,27 +60,11 @@ jobs: image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: matrix: - build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] + build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] include: # ------------------------------------------------------------------- # VFX CY2023 (Python 3.10) # ------------------------------------------------------------------- - - build: 13 - build-type: Debug - build-shared: 'ON' - build-docs: 'OFF' - build-openfx: 'OFF' - use-simd: 'ON' - use-oiio: 'OFF' - cxx-standard: 17 - cxx-compiler: clang++ - cc-compiler: clang - compiler-desc: Clang - vfx-cy: 2024 - install-ext-packages: MISSING - # ------------------------------------------------------------------- - # VFX CY2023 (Python 3.10) - # ------------------------------------------------------------------- - build: 12 build-type: Debug build-shared: 'ON' From a08420a4169c3b0d0122688ae0783d4ddeacac9c Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Sun, 7 Jul 2024 16:29:25 -0400 Subject: [PATCH 8/9] Turn fail-fast off Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index ff21f7b9b3..2bb443d6e0 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -59,6 +59,7 @@ jobs: # Source: https://github.com/AcademySoftwareFoundation/aswf-docker image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: + fail-fast: false matrix: build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] include: From 520c80cee0fc77aaaa68238fc2385408e3fa89ba Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Thu, 11 Jul 2024 19:57:24 -0400 Subject: [PATCH 9/9] Add better comment for install script Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 2 +- share/ci/scripts/linux/yum/install_docs_env.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index 2bb443d6e0..f292ff7d6e 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -59,7 +59,7 @@ jobs: # Source: https://github.com/AcademySoftwareFoundation/aswf-docker image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: - fail-fast: false + fail-fast: true matrix: build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] include: diff --git a/share/ci/scripts/linux/yum/install_docs_env.sh b/share/ci/scripts/linux/yum/install_docs_env.sh index 0a009590ba..df66ae6fd9 100755 --- a/share/ci/scripts/linux/yum/install_docs_env.sh +++ b/share/ci/scripts/linux/yum/install_docs_env.sh @@ -6,9 +6,11 @@ set -ex HERE=$(dirname $0) -# The yum install doxygen command started failing since mirrorlist.centos.org -# was turned off. However, it seems that Doxygen is already installed on our containers -# so this command is not currently necessary: +# The yum install doxygen command started failing during CI since mirrorlist.centos.org +# was turned off. However, it seems that Doxygen is already installed on the containers +# used for CI, so this command is not currently necessary there. You will need to +# uncomment this line if you want to build the documentation on Linux but don't have +# doxygen already installed. # bash $HERE/install_doxygen.sh latest pip install -r $HERE/../../../../../docs/requirements.txt