From 4830d35beb56662a1fd4d1475d420f6b15cb54d3 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sat, 11 Oct 2025 23:55:37 +0900 Subject: [PATCH] codegen: Allow lacking x86_64_macos when aarch64_macos is available --- tools/codegen/base/cargo-sort.json | 4 ++-- tools/codegen/src/main.rs | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/codegen/base/cargo-sort.json b/tools/codegen/base/cargo-sort.json index f62edfc2..e649365d 100644 --- a/tools/codegen/base/cargo-sort.json +++ b/tools/codegen/base/cargo-sort.json @@ -5,12 +5,12 @@ "rust_crate": "${package}", "asset_name": "${package}-${rust_target}.tar.gz", "version_range": "> 1.0.5", - "broken": ["2.0.0", "2.0.1", "2.0.2"], "platform": { "x86_64_linux_gnu": {}, "x86_64_macos": {}, "x86_64_windows": { "asset_name": "${package}-${rust_target}.zip" - } + }, + "aarch64_macos": {} } } diff --git a/tools/codegen/src/main.rs b/tools/codegen/src/main.rs index 5b17217b..ca3c3c5b 100644 --- a/tools/codegen/src/main.rs +++ b/tools/codegen/src/main.rs @@ -620,6 +620,14 @@ fn main() -> Result<()> { continue; } } + if p == HostPlatform::x86_64_macos + && latest_manifest.download_info.contains_key(&HostPlatform::aarch64_macos) + { + // The value of x86_64 macOS binaries has significantly decreased since GitHub Actions + // deprecated macos-13 runner. While the recently introduced macos-15-intel is available + // until 2027-08, people aren't paying much attention to it at this time. + continue; + } bail!( "platform list in base manifest for {package} contains {p:?}, \ but latest release ({latest_version}) doesn't contain it; \