Skip to content

Commit

Permalink
ci: Start using macos-14 ARM runners, bump latest OCIO (AcademySoftwa…
Browse files Browse the repository at this point in the history
…reFoundation#4134)

No more need for the paid macos13-arm-py311 runner and only use it on
the ASWF repo selectively. An ARM-based MacOS-14 runner is now available
for open source projects, so can run free on every PR and on user forks.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
  • Loading branch information
lgritz authored Feb 2, 2024
1 parent 10dcc1b commit c6d4138
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 105 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ jobs:
setenvs: export LIBJPEGTURBO_VERSION=3.0.1
LIBRAW_VERSION=0.21.2
LIBTIFF_VERSION=v4.6.0
OPENCOLORIO_VERSION=v2.3.1
OPENCOLORIO_VERSION=v2.3.2
OPENJPEG_VERSION=v2.4.0
PTEX_VERSION=v2.4.2
PUGIXML_VERSION=v1.14
Expand Down Expand Up @@ -452,7 +452,7 @@ jobs:
macrunner:
name: "${{matrix.runner}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}} boost1.76 exr3.1 ocio2.1"
name: "${{matrix.runner}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}}"
strategy:
fail-fast: false
matrix:
Expand All @@ -463,20 +463,25 @@ jobs:
cxx_std: 17
python_ver: "3.10"
aclang: 13
setenvs: export CTEST_TEST_TIMEOUT=600
- desc: MacOS-13
runner: macos-13
nametag: macos13-py311
cxx_std: 20
cxx_std: 17
python_ver: "3.11"
aclang: 14
setenvs: export CTEST_TEST_TIMEOUT=600
- desc: MacOS-14-ARM
runner: macos-14
nametag: macos14-arm-py311
cxx_std: 20
python_ver: "3.11"
aclang: 15
runs-on: ${{ matrix.runner }}
env:
CC: clang
CXX: clang++
CMAKE_CXX_STANDARD: ${{ matrix.cxx_std }}
PYTHON_VERSION: ${{ matrix.python_ver }}
CTEST_TEST_TIMEOUT: 600
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Prepare ccache timestamp
Expand Down
100 changes: 0 additions & 100 deletions .github/workflows/macarm.yml

This file was deleted.

0 comments on commit c6d4138

Please sign in to comment.