Skip to content

Commit f7dda11

Browse files
committed
ci: Start using macos-14 ARM runners, bump latest OCIO
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>
1 parent 01c9163 commit f7dda11

File tree

2 files changed

+10
-105
lines changed

2 files changed

+10
-105
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ jobs:
294294
setenvs: export LIBJPEGTURBO_VERSION=3.0.1
295295
LIBRAW_VERSION=0.21.2
296296
LIBTIFF_VERSION=v4.6.0
297-
OPENCOLORIO_VERSION=v2.3.1
297+
OPENCOLORIO_VERSION=v2.3.2
298298
OPENJPEG_VERSION=v2.4.0
299299
PTEX_VERSION=v2.4.2
300300
PUGIXML_VERSION=v1.14
@@ -452,7 +452,7 @@ jobs:
452452
453453
454454
macrunner:
455-
name: "${{matrix.runner}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}} boost1.76 exr3.1 ocio2.1"
455+
name: "${{matrix.runner}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}}"
456456
strategy:
457457
fail-fast: false
458458
matrix:
@@ -463,20 +463,25 @@ jobs:
463463
cxx_std: 17
464464
python_ver: "3.10"
465465
aclang: 13
466-
setenvs: export CTEST_TEST_TIMEOUT=600
467466
- desc: MacOS-13
468467
runner: macos-13
469468
nametag: macos13-py311
470-
cxx_std: 20
469+
cxx_std: 17
471470
python_ver: "3.11"
472471
aclang: 14
473-
setenvs: export CTEST_TEST_TIMEOUT=600
472+
- desc: MacOS-14-ARM
473+
runner: macos-14
474+
nametag: macos14-arm-py311
475+
cxx_std: 20
476+
python_ver: "3.11"
477+
aclang: 15
474478
runs-on: ${{ matrix.runner }}
475479
env:
476480
CC: clang
477481
CXX: clang++
478482
CMAKE_CXX_STANDARD: ${{ matrix.cxx_std }}
479483
PYTHON_VERSION: ${{ matrix.python_ver }}
484+
CTEST_TEST_TIMEOUT: 600
480485
steps:
481486
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
482487
- name: Prepare ccache timestamp

.github/workflows/macarm.yml

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)