From c3bfeca24d8ab3d4fe6ce71d92089785708765a8 Mon Sep 17 00:00:00 2001 From: David Brubaker Date: Wed, 11 Nov 2026 12:28:26 -0600 Subject: [PATCH] Migrate macOS Apple Silicon CI runner from retired macos-14 to macos-26 --- scripts/release/catalog.py | 2 +- scripts/release/platforms.json | 2 +- scripts/release/tests/test_release.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/release/catalog.py b/scripts/release/catalog.py index c285be6..ebae111 100644 --- a/scripts/release/catalog.py +++ b/scripts/release/catalog.py @@ -34,7 +34,7 @@ def targets(path=None): if r['arch'] != arch or r['library'] != library or r['resource'] != f"natives/{r['system']}-{arch}/{r['backend']}/{library}": raise ValueError('Incorrect native resource contract') expected_runner = ('ubuntu-24.04' if r['system'] == 'linux' and r['backend'] == 'vulkan' - else {'linux': 'ubuntu-22.04', 'windows': 'windows-2022', 'macos': 'macos-14'}[r['system']]) + else {'linux': 'ubuntu-22.04', 'windows': 'windows-2022', 'macos': 'macos-26'}[r['system']]) if r['runner'] != expected_runner or r['baseline'] != ('armv8-a' if arch == 'aarch64' else 'x86-64-v3'): raise ValueError('Incorrect runner or CPU baseline') return rows diff --git a/scripts/release/platforms.json b/scripts/release/platforms.json index 162360d..6cfa025 100644 --- a/scripts/release/platforms.json +++ b/scripts/release/platforms.json @@ -87,7 +87,7 @@ }, { "id": "macos-aarch64-metal", - "runner": "macos-14", + "runner": "macos-26", "system": "macos", "arch": "aarch64", "backend": "metal", diff --git a/scripts/release/tests/test_release.py b/scripts/release/tests/test_release.py index 64f128d..6c9811c 100644 --- a/scripts/release/tests/test_release.py +++ b/scripts/release/tests/test_release.py @@ -281,6 +281,8 @@ def test_catalog_duplicate_and_unknown_mask(self): [{**r, 'mask': r['mask'] | 128} for r in data['targets']], [{**r, 'runner': 'ubuntu-latest'} if r['backend'] == 'vulkan' and r['system'] == 'linux' else r for r in data['targets']], + [{**r, 'runner': 'macos-14'} if r['system'] == 'macos' else r + for r in data['targets']], ]: path.write_text(json.dumps({'schema': 1, 'targets': rows})) with self.assertRaises(ValueError): targets(path)