From c823f837c08fe02fbaa0832bba7576fc8cf5f5cd Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 16 Oct 2025 19:19:20 +0200 Subject: [PATCH] ci: bump macos-13 to macos-14 macos-13 image is getting retired in December 2025 (backported from commit 7a26bee6eef439a692e434d6861cac99ba8df542) --- .github/workflows/create-test-plan.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-test-plan.py b/.github/workflows/create-test-plan.py index 986bdefa4d..3cd640175c 100755 --- a/.github/workflows/create-test-plan.py +++ b/.github/workflows/create-test-plan.py @@ -30,7 +30,9 @@ class JobOs(Enum): Ubuntu22_04 = "ubuntu-22.04" Ubuntu24_04 = "ubuntu-24.04" Ubuntu24_04_arm = "ubuntu-24.04-arm" - Macos13 = "macos-13" + Macos14 = "macos-14" # macOS Sonoma (2023) + Macos15 = "macos-15" # macOS Sequoia (2024) + Macos26 = "macos-26" # macOS Tahoe (2025) class SdlPlatform(Enum): @@ -115,7 +117,7 @@ JOB_SPECS = { "steamrt-sniper": JobSpec(name="Steam Linux Runtime (Sniper)", os=JobOs.UbuntuLatest, platform=SdlPlatform.Linux, artifact="SDL-slrsniper", container="registry.gitlab.steamos.cloud/steamrt/sniper/sdk:beta", ), "ubuntu-intel-icx": JobSpec(name="Ubuntu 22.04 (Intel oneAPI)", os=JobOs.Ubuntu22_04, platform=SdlPlatform.Linux, artifact="SDL-ubuntu22.04-oneapi", intel=IntelCompiler.Icx, ), "ubuntu-intel-icc": JobSpec(name="Ubuntu 22.04 (Intel Compiler)", os=JobOs.Ubuntu22_04, platform=SdlPlatform.Linux, artifact="SDL-ubuntu22.04-icc", intel=IntelCompiler.Icc, ), - "macos-framework-x64": JobSpec(name="MacOS (Framework) (x64)", os=JobOs.Macos13, platform=SdlPlatform.MacOS, artifact="SDL-macos-framework", apple_framework=True, apple_archs={AppleArch.Aarch64, AppleArch.X86_64, }, xcode=True, ), + "macos-framework-x64": JobSpec(name="MacOS (Framework) (x64)", os=JobOs.Macos14, platform=SdlPlatform.MacOS, artifact="SDL-macos-framework", apple_framework=True, apple_archs={AppleArch.Aarch64, AppleArch.X86_64, }, xcode=True, ), "macos-framework-arm64": JobSpec(name="MacOS (Framework) (arm64)", os=JobOs.MacosLatest, platform=SdlPlatform.MacOS, artifact=None, apple_framework=True, apple_archs={AppleArch.Aarch64, AppleArch.X86_64, }, ), "macos-gnu-arm64": JobSpec(name="MacOS (GNU prefix)", os=JobOs.MacosLatest, platform=SdlPlatform.MacOS, artifact="SDL-macos-arm64-gnu", apple_framework=False, apple_archs={AppleArch.Aarch64, }, ), "ios": JobSpec(name="iOS (CMake & xcode)", os=JobOs.MacosLatest, platform=SdlPlatform.Ios, artifact="SDL-ios-arm64", xcode=True, ), @@ -512,8 +514,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta job.shared_lib = SharedLibType.DYLIB job.static_lib = StaticLibType.A job.ccache = True - if spec.os == JobOs.Macos13: - job.ccache = False job.apt_packages = [] job.brew_packages.extend(( "ninja",