Skip to content

Commit

Permalink
Merge branch 'main' into feature/ocioview-preview-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
michdolan authored Jul 22, 2024
2 parents da220b2 + 360e66d commit 27743bc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -316,7 +319,7 @@ jobs:
# ---------------------------------------------------------------------------

macos:
name: 'macOS 11
name: 'macOS 12
<AppleClang
arch=${{ matrix.arch-type }},
config=${{ matrix.build-type }},
Expand All @@ -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]
Expand Down
8 changes: 7 additions & 1 deletion share/ci/scripts/linux/yum/install_docs_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 27743bc

Please sign in to comment.