Merge branch 'tauri-apps:v2' into allow-no-origin

pull/1941/head
Niko Korvenlaita 9 months ago committed by GitHub
commit 5c3e8cdf55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -126,7 +126,7 @@ jobs:
clippy:
needs: changes
if: ${{ needs.changes.outputs.packages != '[]' && needs.changes.outputs.packages != '' }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:

@ -168,7 +168,7 @@ jobs:
}
- {
target: x86_64-unknown-linux-gnu,
os: ubuntu-latest,
os: ubuntu-22.04,
runner: 'cargo',
command: 'test'
}

@ -145,7 +145,9 @@ impl Builder {
for db in config.preload {
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?;
pool.migrate(&migrator).await?;
}

Loading…
Cancel
Save