From bf8dc4ac81691a945b025f53efd1e0653bd12cd9 Mon Sep 17 00:00:00 2001 From: Roth Michaels Date: Thu, 28 Nov 2024 16:36:33 +0100 Subject: [PATCH 1/2] Update Xcode versions for apple-clang builds Since mp-units requires at least Xcode 15 we should have coverage on the latest compilers for operating system versions for macOS 13 (Ventura) and macOS 14 (Sequoia) as those are the operating systems with necessary compilers that our users would be using. Now build with Xcode 15.2 instead of 15.0.1 which last version supported on macOS 13. Add a build for Xcode 15.4 and Xcode 16.1 for testing macOS 14 builds. Since Xcode 16.1 is new most of our clients using macOS 14 would might more likely be using Xcode 15.4. There might not be much C++ changes between Xcode 15.2 and Xcode 15.4 so perhaps we should drop 15.4 if adding three apple-clang builds is not worth the resources. --- .github/generate-job-matrix.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/generate-job-matrix.py b/.github/generate-job-matrix.py index bd14ee00..8c03b9e6 100644 --- a/.github/generate-job-matrix.py +++ b/.github/generate-job-matrix.py @@ -53,13 +53,13 @@ def make_clang_config( return Configuration(**vars(ret)) -def make_apple_clang_config(version: int) -> Configuration: +def make_apple_clang_config(os: str, version: str) -> Configuration: ret = Configuration( name=f"Apple Clang {version}", - os="macos-13", + os=os, compiler=Compiler( type="APPLE_CLANG", - version=f"{version}.0", + version=version, cc="clang", cxx="clang++", ), @@ -95,7 +95,8 @@ configs = { # arm64 runners are expensive; only consider one version if ver == 18 or platform != "arm64" ] - + [make_apple_clang_config(ver) for ver in [15]] + + [make_apple_clang_config("macos-13", ver) for ver in ["15.2"]] + + [make_apple_clang_config("macos-14", ver) for ver in ["15.4", "16.1"]] + [make_msvc_config(release="14.4", version=194)] } From b70ded5b8253c4d3535fdc244ab833ccb30d751f Mon Sep 17 00:00:00 2001 From: Roth Michaels Date: Thu, 19 Dec 2024 12:17:55 -0500 Subject: [PATCH 2/2] Drop 15.4 support from PR discussion --- .github/generate-job-matrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/generate-job-matrix.py b/.github/generate-job-matrix.py index 8c03b9e6..a8ff414f 100644 --- a/.github/generate-job-matrix.py +++ b/.github/generate-job-matrix.py @@ -96,7 +96,7 @@ configs = { if ver == 18 or platform != "arm64" ] + [make_apple_clang_config("macos-13", ver) for ver in ["15.2"]] - + [make_apple_clang_config("macos-14", ver) for ver in ["15.4", "16.1"]] + + [make_apple_clang_config("macos-14", ver) for ver in ["16.1"]] + [make_msvc_config(release="14.4", version=194)] }