davidl/tolaria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: cargo fmt (#135)

Browse Source 
* 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 ee42731.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* style: cargo fmt

---------

Co-authored-by: Test <test@test.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Luca Rossi
2026-02-28 13:33:09 +01:00
committed by GitHub
parent ce12e3cd6f
commit 465a80d3e1
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/release.yml vendored
View File

@@ -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 }}

4
src-tauri/src/lib.rs
View File

@@ -123,9 +123,7 @@ fn migrate_is_a_to_type(vault_path: String) -> Result<usize, String> {
fn create_getting_started_vault(target_path: Option<String>) -> Result<String, String> {
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)
}

11
src-tauri/src/vault/getting_started.rs
View File

@@ -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<String, String> {
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());