artin/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-02-06 11:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

build(tauri-macos-sign): remove once-cell-regex (#14766)

Browse Source 
Co-authored-by: Fabian-Lars <github@fabianlars.de>
This commit is contained in:
sftse 2026-01-15 13:14:30 +01:00 committed by GitHub
parent 07788af13f
commit 268bb339f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/change-pr-14766.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri-macos-sign": patch:deps
---
Remove once-cell-regex from direct dependencies.

3
Cargo.lock generated
View File

@ -8799,11 +8799,12 @@ dependencies = [
"chrono", "chrono",
"dirs 6.0.0", "dirs 6.0.0",
"log", "log",
"once-cell-regex", "once_cell",
"os_pipe", "os_pipe",
"p12", "p12",
"plist", "plist",
"rand 0.9.1", "rand 0.9.1",
"regex",
"serde", "serde",
"serde_json", "serde_json",
"tempfile", "tempfile",

3
crates/tauri-macos-sign/Cargo.toml
View File

@ -15,7 +15,8 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
tempfile = "3" tempfile = "3"
x509-certificate = "0.23" x509-certificate = "0.23"
once-cell-regex = "0.2" once_cell = "1"
regex = "1"
os_pipe = "1" os_pipe = "1"
plist = "1" plist = "1"
rand = "0.9" rand = "0.9"

10
crates/tauri-macos-sign/src/keychain/identity.rs
View File

@ -2,7 +2,8 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT // 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 std::{collections::BTreeSet, path::Path, process::Command};
use x509_certificate::certificate::X509Certificate; use x509_certificate::certificate::X509Certificate;
@ -49,9 +50,10 @@ impl Team {
organization organization
} else { } else {
println!( println!(
"found cert {common_name:?} but failed to get organization; falling back to displaying common name" "found cert {common_name:?} but failed to get organization; falling back to displaying common name"
); );
regex!(r"Apple Develop\w+: (.*) \(.+\)") static APPLE_DEV: OnceCell<Regex> = OnceCell::new();
APPLE_DEV.get_or_init(|| Regex::new(r"Apple Develop\w+: (.*) \(.+\)").unwrap())
.captures(&common_name) .captures(&common_name)
.map(|caps| caps[1].to_owned()) .map(|caps| caps[1].to_owned())
.unwrap_or_else(|| { .unwrap_or_else(|| {