Merge branch 'main' into fix-apple-gcc-xlocale

amyspark · Jul 22, 2024 · 591ff87 · 591ff87
2 parents 26c8537 + 1e17c9a
commit 591ff87
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git 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: true
       matrix:
         build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
         include:
@@ -233,6 +234,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
@@ -316,7 +319,7 @@ jobs:
   # ---------------------------------------------------------------------------
 
   macos:
-    name: 'macOS 11
+    name: 'macOS 12
       <AppleClang 
        arch=${{ matrix.arch-type }},
        config=${{ matrix.build-type }}, 
@@ -330,7 +333,7 @@ jobs:
     if: |
       github.event_name == 'push' ||
       github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: macos-11
+    runs-on: macos-12
     strategy:
       matrix:
         build: [1, 2, 3, 4]

diff --git a/share/ci/scripts/linux/yum/install_docs_env.sh b/share/ci/scripts/linux/yum/install_docs_env.sh
@@ -6,5 +6,11 @@ set -ex
 
 HERE=$(dirname $0)
 
-bash $HERE/install_doxygen.sh latest
+# 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
diff --git a/share/cmake/modules/install/Installminizip-ng.cmake b/share/cmake/modules/install/Installminizip-ng.cmake
@@ -131,6 +131,7 @@ if(NOT minizip-ng_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_P
                             --config ${CMAKE_BUILD_TYPE}
                             --target install
                             --parallel
+        DEPENDS ZLIB::ZLIB        # minizip-ng depends on zlib
     )
 
     add_dependencies(MINIZIP::minizip-ng minizip-ng_install)