From e1c427b2733fe845de4d8d33e1e3fcd7c71ca2d4 Mon Sep 17 00:00:00 2001 From: c Date: Tue, 13 Jan 2026 11:27:08 +0100 Subject: [PATCH 1/4] build(tauri-macos-sign): remove once-cell-regex --- Cargo.lock | 3 ++- crates/tauri-macos-sign/Cargo.toml | 3 ++- crates/tauri-macos-sign/src/keychain/identity.rs | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50bead4b4a99..b9eb46e63c7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8799,11 +8799,12 @@ dependencies = [ "chrono", "dirs 6.0.0", "log", - "once-cell-regex", + "once_cell", "os_pipe", "p12", "plist", "rand 0.9.1", + "regex", "serde", "serde_json", "tempfile", diff --git a/crates/tauri-macos-sign/Cargo.toml b/crates/tauri-macos-sign/Cargo.toml index 9fc874364296..854ce5a43f81 100644 --- a/crates/tauri-macos-sign/Cargo.toml +++ b/crates/tauri-macos-sign/Cargo.toml @@ -15,7 +15,8 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" tempfile = "3" x509-certificate = "0.23" -once-cell-regex = "0.2" +once_cell = "1.20" +regex = "1.11" os_pipe = "1" plist = "1" rand = "0.9" diff --git a/crates/tauri-macos-sign/src/keychain/identity.rs b/crates/tauri-macos-sign/src/keychain/identity.rs index a39c48423664..6ac1469152f6 100644 --- a/crates/tauri-macos-sign/src/keychain/identity.rs +++ b/crates/tauri-macos-sign/src/keychain/identity.rs @@ -2,7 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT -use once_cell_regex::regex; +use once_cell::sync::OnceCell; +use regex::Regex; use std::{collections::BTreeSet, path::Path, process::Command}; use x509_certificate::certificate::X509Certificate; @@ -49,9 +50,10 @@ impl Team { organization } else { println!( - "found cert {common_name:?} but failed to get organization; falling back to displaying common name" - ); - regex!(r"Apple Develop\w+: (.*) \(.+\)") + "found cert {common_name:?} but failed to get organization; falling back to displaying common name" + ); + static APPLE_DEV: OnceCell = OnceCell::new(); + APPLE_DEV.get_or_init(|| Regex::new(r"Apple Develop\w+: (.*) \(.+\)").unwrap()) .captures(&common_name) .map(|caps| caps[1].to_owned()) .unwrap_or_else(|| { From b7655c5be0fb548541c23f4f9a86c47eb22af82e Mon Sep 17 00:00:00 2001 From: sftse Date: Tue, 13 Jan 2026 15:11:25 +0100 Subject: [PATCH 2/4] Update crates/tauri-macos-sign/Cargo.toml Co-authored-by: Fabian-Lars --- crates/tauri-macos-sign/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/tauri-macos-sign/Cargo.toml b/crates/tauri-macos-sign/Cargo.toml index 854ce5a43f81..309938c27f5b 100644 --- a/crates/tauri-macos-sign/Cargo.toml +++ b/crates/tauri-macos-sign/Cargo.toml @@ -15,8 +15,8 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" tempfile = "3" x509-certificate = "0.23" -once_cell = "1.20" -regex = "1.11" +once_cell = "1" +regex = "1" os_pipe = "1" plist = "1" rand = "0.9" From b5427694c322af5c9a208e63515c32413597dae9 Mon Sep 17 00:00:00 2001 From: sftse Date: Tue, 13 Jan 2026 15:17:45 +0100 Subject: [PATCH 3/4] Add change file --- .changes/change-pr-14766.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changes/change-pr-14766.md diff --git a/.changes/change-pr-14766.md b/.changes/change-pr-14766.md new file mode 100644 index 000000000000..38c69690c57c --- /dev/null +++ b/.changes/change-pr-14766.md @@ -0,0 +1,5 @@ +--- +"tauri-macos-sign": patch +--- + +Remove once-cell-regex from direct dependencies. From 1baa5525e3b71353aa96367d268d58275eb26320 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Thu, 15 Jan 2026 13:13:15 +0100 Subject: [PATCH 4/4] Update change-pr-14766.md --- .changes/change-pr-14766.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changes/change-pr-14766.md b/.changes/change-pr-14766.md index 38c69690c57c..4fb885f88667 100644 --- a/.changes/change-pr-14766.md +++ b/.changes/change-pr-14766.md @@ -1,5 +1,5 @@ --- -"tauri-macos-sign": patch +"tauri-macos-sign": patch:deps --- Remove once-cell-regex from direct dependencies.