Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for GitHub Actions node.js glibc issue #1990

Merged
merged 10 commits into from
Jul 12, 2024
Merged

Fix for GitHub Actions node.js glibc issue #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24c44d0
Fix for node.js glibc issue
doug-walker Jul 6, 2024
287fcd0
Temporarily turn off Linux docs builds
doug-walker Jul 6, 2024
2b3f4ec
Temporarily turn off Linux docs builds, 2nd try
doug-walker Jul 6, 2024
6579520
Update macOS runner from 11 to 12
doug-walker Jul 7, 2024
20504d5
Attempt docs install fix
doug-walker Jul 7, 2024
78e4826
Another docs fix attempt, and add 2024 container
doug-walker Jul 7, 2024
98fe994
Remove 2024 container test
doug-walker Jul 7, 2024
a08420a
Turn fail-fast off
doug-walker Jul 7, 2024
520c80c
Add better comment for install script
doug-walker Jul 11, 2024
e29ddc9
Merge branch 'main' into bug/ci_fixes
doug-walker Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/ci_workflow.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading