CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-09-26 21:41:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/v2' into store-rework-2

Browse Source
This commit is contained in:
Tony
2024-10-15 09:23:10 +08:00
parent 1c401f7cb0 aef5dd6157
commit 3127ce562b
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/lint-rust.yml
+1 -1
View File
@@ -126,7 +126,7 @@ jobs:
clippy: clippy:
needs: changes needs: changes
if: ${{ needs.changes.outputs.packages != '[]' && needs.changes.outputs.packages != '' }} if: ${{ needs.changes.outputs.packages != '[]' && needs.changes.outputs.packages != '' }}
runs-on: ubuntu-latest runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
.github/workflows/test-rust.yml
+1 -1
View File
@@ -168,7 +168,7 @@ jobs:
} }
- { - {
target: x86_64-unknown-linux-gnu, target: x86_64-unknown-linux-gnu,
os: ubuntu-latest, os: ubuntu-22.04,
runner: 'cargo', runner: 'cargo',
command: 'test' command: 'test'
} }
plugins/sql/src/lib.rs
+3 -1
View File
@@ -145,7 +145,9 @@ impl Builder {
for db in config.preload { for db in config.preload {
let pool = DbPool::connect(&db, app).await?; let pool = DbPool::connect(&db, app).await?;
if let Some(migrations) = self.migrations.as_mut().unwrap().remove(&db) { if let Some(migrations) =
self.migrations.as_mut().and_then(|mm| mm.remove(&db))
{
let migrator = Migrator::new(migrations).await?; let migrator = Migrator::new(migrations).await?;
pool.migrate(&migrator).await?; pool.migrate(&migrator).await?;
} }