Merge remote-tracking branch 'uni/main' into build-airdrop-integrations2

tari-project · Sep 27, 2024 · 0e7ff21 · 0e7ff21
2 parents b6aa2bd + 93c1ee2
commit 0e7ff21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -81,7 +81,7 @@ jobs:
           # Don't mess with the double quotes and inner escaped quotes
           yq eval ".package.productName += \"${{ env.BETA_STRING }}\"" -i tauri.conf.json
           yq eval ".package.version += \"-${BETA_DATE}\"" -i tauri.conf.json
-          yq eval ".tauri.updater.active = \"false"" -i tauri.conf.json
+          yq eval ".tauri.updater.active = false" -i tauri.conf.json
           sed -i.bak -E "s/^version\s*=\s*\"([0-9]+\.[0-9]+\.[0-9]+)\"/version = \"\1-${BETA_DATE}\"/" \
             Cargo.toml
 

diff --git a/src-tauri/src/internal_wallet.rs b/src-tauri/src/internal_wallet.rs
@@ -88,7 +88,7 @@ impl InternalWallet {
                 }
                 Err(_) => {
                     let passphrase = SafePassword::from(generate_password(32));
-                    let _ = entry.delete_credential();
+                    let _unused = entry.delete_credential();
                     entry.set_password(&String::from_utf8(passphrase.reveal().clone())?)?;
                     passphrase
                 }