From 074c22286c5d6a17a52a07a7612b3d26e1869442 Mon Sep 17 00:00:00 2001 From: Luca Rossi Date: Sat, 28 Feb 2026 13:33:09 +0100 Subject: [PATCH] style: cargo fmt (#135) * ci: re-enable macOS code signing and notarization Uncomment the Apple credential env vars in the release workflow so Tauri's build step signs and notarizes the .app bundle. This reverses the temporary disable from b03d6df. Co-Authored-By: Claude Opus 4.6 * style: cargo fmt --------- Co-authored-by: Test Co-authored-by: Claude Opus 4.6 --- .github/workflows/release.yml | 13 ++++++------- src-tauri/src/lib.rs | 4 +--- src-tauri/src/vault/getting_started.rs | 11 +++++++++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de72b292..82cb92d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,13 +84,12 @@ jobs: env: TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - # Code signing + notarization (re-enabled once certificate is ready) - # APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} - # APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - # APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} - # APPLE_ID: ${{ secrets.APPLE_ID }} - # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - # APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} + APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} + APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} run: | pnpm tauri build --target ${{ matrix.target }} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 539bb2f8..fdf33236 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -123,9 +123,7 @@ fn migrate_is_a_to_type(vault_path: String) -> Result { fn create_getting_started_vault(target_path: Option) -> Result { let path = match target_path { Some(p) if !p.is_empty() => p, - _ => vault::default_vault_path()? - .to_string_lossy() - .to_string(), + _ => vault::default_vault_path()?.to_string_lossy().to_string(), }; vault::create_getting_started_vault(&path) } diff --git a/src-tauri/src/vault/getting_started.rs b/src-tauri/src/vault/getting_started.rs index 62ee695d..b2c7a838 100644 --- a/src-tauri/src/vault/getting_started.rs +++ b/src-tauri/src/vault/getting_started.rs @@ -267,7 +267,12 @@ This topic groups notes related to learning and getting started with Laputa. pub fn create_getting_started_vault(target_path: &str) -> Result { let vault_dir = Path::new(target_path); - if vault_dir.exists() && vault_dir.read_dir().map(|mut d| d.next().is_some()).unwrap_or(false) { + if vault_dir.exists() + && vault_dir + .read_dir() + .map(|mut d| d.next().is_some()) + .unwrap_or(false) + { return Err(format!( "Directory already exists and is not empty: {}", target_path @@ -322,7 +327,9 @@ mod tests { assert!(vault_path.join("note/welcome-to-laputa.md").exists()); assert!(vault_path.join("note/editor-basics.md").exists()); assert!(vault_path.join("note/using-properties.md").exists()); - assert!(vault_path.join("note/wiki-links-and-relationships.md").exists()); + assert!(vault_path + .join("note/wiki-links-and-relationships.md") + .exists()); assert!(vault_path.join("project/sample-project.md").exists()); assert!(vault_path.join("person/sample-collaborator.md").exists()); assert!(vault_path.join("topic/getting-started.md").exists());