From 69ca199a7d99f4e5f8b417f59c5104d8bf61397e Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Wed, 28 Oct 2026 09:09:18 +0700 Subject: [PATCH] chore: drop macos x64 from release builds --- .github/workflows/release.yml | 3 - Cargo.lock | 96 ++++++++++++++++---------------- crates/auto_update/src/source.rs | 6 +- rust-toolchain.toml | 1 - 4 files changed, 51 insertions(+), 55 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2042003d..c2bee69c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,9 +20,6 @@ jobs: - platform: windows-arm64 os: windows-11-arm target: aarch64-pc-windows-msvc - - platform: macos-x64 - os: macos-15-intel - target: x86_64-apple-darwin - platform: macos-arm64 os: macos-latest target: aarch64-apple-darwin diff --git a/Cargo.lock b/Cargo.lock index 001b2d59..3618f28f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,9 +96,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" +checksum = "e567177890eb1617b1f774005b66b26b2377afd138a2ca37aae7d8f0c81429d4" dependencies = [ "gimli", ] @@ -335,7 +335,7 @@ dependencies = [ [[package]] name = "assets" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "gpui-kit", @@ -578,7 +578,7 @@ dependencies = [ [[package]] name = "auto_update" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "futures", "gpui-pre", @@ -663,14 +663,14 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" +checksum = "42f4220217f3288537b83684130f42fad43320b1c3b805f1910d683d52ded24f" dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.9", + "miniz_oxide 0.9.1", "object", "rustc-demangle", "windows-link 0.2.1", @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "chat" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "common", @@ -1154,7 +1154,7 @@ dependencies = [ [[package]] name = "chat_ui" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "chat", @@ -1324,7 +1324,7 @@ dependencies = [ [[package]] name = "common" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "chrono", @@ -1455,7 +1455,7 @@ dependencies = [ [[package]] name = "coop" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "assets", "auto_update", @@ -1485,7 +1485,7 @@ dependencies = [ [[package]] name = "coop_web" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "assets", "chat", @@ -2894,9 +2894,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" +checksum = "1033caf0b349c518623b5396bfb2cf0bddf44f0306d543a250e5743297aafd10" [[package]] name = "gl_generator" @@ -2917,9 +2917,9 @@ checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b" [[package]] name = "globset" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988" +checksum = "f98b0d85522dc0a824cfebbc9594ff4a9b289c568bea0370319dfbdf20ccdd2d" dependencies = [ "aho-corasick", "bstr", @@ -4187,9 +4187,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f" +checksum = "484be5657551d7868d67587df967fb4fcbe9d266a761cc855aaa148fda0b3cc7" dependencies = [ "crossbeam-deque", "globset", @@ -5407,7 +5407,7 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nip29" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "chat", @@ -5425,7 +5425,7 @@ dependencies = [ [[package]] name = "nip29_ui" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "chat", @@ -5448,7 +5448,7 @@ dependencies = [ [[package]] name = "nip4e" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "flume 0.11.1", @@ -5516,7 +5516,7 @@ dependencies = [ [[package]] name = "nostr" version = "0.45.5" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "aes", "base64 0.22.1", @@ -5542,7 +5542,7 @@ dependencies = [ [[package]] name = "nostr-blossom" version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "base64 0.22.1", "bitcoin_hashes 1.2.0", @@ -5555,7 +5555,7 @@ dependencies = [ [[package]] name = "nostr-browser-signer" version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "js-sys", "nostr", @@ -5568,7 +5568,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "async-utility", "nostr", @@ -5581,7 +5581,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "nostr", "opaquerr 0.2.0", @@ -5590,7 +5590,7 @@ dependencies = [ [[package]] name = "nostr-gossip" version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "nostr", "opaquerr 0.2.0", @@ -5599,7 +5599,7 @@ dependencies = [ [[package]] name = "nostr-gossip-memory" version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "indexmap 2.14.2", "lru", @@ -5611,7 +5611,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.45.3" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "async-utility", "flatbuffers", @@ -5626,7 +5626,7 @@ dependencies = [ [[package]] name = "nostr-memory" version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "btreecap", "nostr", @@ -5637,7 +5637,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.45.4" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "async-utility", "async-wsocket", @@ -5659,7 +5659,7 @@ dependencies = [ [[package]] name = "nostr-sqlite" version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#f7ebc0a88ea27ac4e3d74b941e3a44ddb10b306c" +source = "git+https://github.com/rust-nostr/nostr#37f139dfbb0a5c5f879cb052df737648a0727097" dependencies = [ "async-utility", "nostr", @@ -5704,9 +5704,9 @@ dependencies = [ [[package]] name = "notify-types" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" +checksum = "0a437a9308232ce794b1e7fdf540d38ea37efc3c73492640c13b4c8568b8f108" dependencies = [ "bitflags 2.13.2", ] @@ -6238,9 +6238,9 @@ dependencies = [ [[package]] name = "object" -version = "0.37.3" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +checksum = "dd229a0361b9d0d4396176e02d65897f487eebeab7caa6d443855ee152ca0b9c" dependencies = [ "memchr", ] @@ -6386,9 +6386,9 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +checksum = "7e036b411754132fd6b74e94b74e9a13c5cf606fa93d1885c35860d3060820b1" [[package]] name = "openssl-sys" @@ -6580,7 +6580,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "person" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "common", @@ -7656,9 +7656,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags 2.13.2", "errno", @@ -8142,7 +8142,7 @@ dependencies = [ [[package]] name = "settings" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "common", @@ -8371,7 +8371,7 @@ dependencies = [ [[package]] name = "speech" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "common", @@ -8466,7 +8466,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "state" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "aes-gcm", "anyhow", @@ -9343,7 +9343,7 @@ dependencies = [ [[package]] name = "ui" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "common", "gpui-base", @@ -9443,9 +9443,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557" [[package]] name = "unicode-xid" @@ -10888,7 +10888,7 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "workspace" -version = "2.0.0-alpha2" +version = "2.0.0-alpha3" dependencies = [ "anyhow", "auto_update", diff --git a/crates/auto_update/src/source.rs b/crates/auto_update/src/source.rs index 89d3a5fe..8b816ecb 100644 --- a/crates/auto_update/src/source.rs +++ b/crates/auto_update/src/source.rs @@ -37,9 +37,8 @@ pub fn asset_filter_for(os: &str, arch: &str) -> Option { }; let arch = match (os, arch) { - // cargo-packager names the disk images `aarch64`/`x64`. + // cargo-packager names the disk images `aarch64`. ("macos", "aarch64") => "aarch64", - ("macos", "x86_64") => "x64", // `script/bundle-linux` names the tarballs `aarch64`/`x86_64`. ("linux", "aarch64") => "aarch64", ("linux", "x86_64") => "x86_64", @@ -243,7 +242,7 @@ mod tests { #[test] fn picks_the_artifact_matching_os_and_architecture() { assert_eq!(selected("macos", "aarch64"), Some("Coop_1.0.1_aarch64.dmg")); - assert_eq!(selected("macos", "x86_64"), Some("Coop_1.0.1_x64.dmg")); + assert_eq!(selected("macos", "x86_64"), None); assert_eq!( selected("linux", "aarch64"), Some("coop-linux-aarch64.tar.gz") @@ -258,6 +257,7 @@ mod tests { fn has_no_target_for_windows_or_unknown_platforms() { assert_eq!(asset_filter_for("windows", "x86_64"), None); assert_eq!(asset_filter_for("freebsd", "x86_64"), None); + assert_eq!(asset_filter_for("macos", "x86_64"), None); assert_eq!(asset_filter_for("macos", "riscv64"), None); } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 84ba93a7..872c8825 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -3,7 +3,6 @@ channel = "1.98" profile = "minimal" components = ["rustfmt", "clippy"] targets = [ - "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc",