Merge branch 'fix/sqlcipher-vendored-openssl' of sarman/tftsr-devops_investigation into master

This commit is contained in:
Shaun Arman 2026-03-16 00:19:21 +00:00 committed by Gogs
commit 48b63086a6
3 changed files with 5 additions and 5 deletions

View File

@ -23,7 +23,7 @@ pipeline:
when: when:
event: tag event: tag
commands: commands:
- apt-get update -qq && apt-get install -y -qq libwebkit2gtk-4.1-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf pkg-config curl - apt-get update -qq && apt-get install -y -qq libwebkit2gtk-4.1-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf pkg-config curl perl
- curl -fsSL https://deb.nodesource.com/setup_22.x | bash - - curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
- apt-get install -y nodejs - apt-get install -y nodejs
- npm ci --legacy-peer-deps - npm ci --legacy-peer-deps
@ -44,7 +44,7 @@ pipeline:
when: when:
event: tag event: tag
commands: commands:
- apt-get update -qq && apt-get install -y -qq mingw-w64 curl nsis - apt-get update -qq && apt-get install -y -qq mingw-w64 curl nsis perl
- curl -fsSL https://deb.nodesource.com/setup_22.x | bash - - curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
- apt-get install -y nodejs - apt-get install -y nodejs
- npm ci --legacy-peer-deps - npm ci --legacy-peer-deps

View File

@ -16,14 +16,14 @@ pipeline:
rust-clippy: rust-clippy:
image: rust:1.88-slim image: rust:1.88-slim
commands: commands:
- apt-get update -qq && apt-get install -y -qq libwebkit2gtk-4.1-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf pkg-config - apt-get update -qq && apt-get install -y -qq libwebkit2gtk-4.1-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf pkg-config perl
- rustup component add clippy - rustup component add clippy
- cargo clippy --manifest-path src-tauri/Cargo.toml -- -D warnings - cargo clippy --manifest-path src-tauri/Cargo.toml -- -D warnings
rust-tests: rust-tests:
image: rust:1.88-slim image: rust:1.88-slim
commands: commands:
- apt-get update -qq && apt-get install -y -qq libwebkit2gtk-4.1-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf pkg-config - apt-get update -qq && apt-get install -y -qq libwebkit2gtk-4.1-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf pkg-config perl
- cargo test --manifest-path src-tauri/Cargo.toml - cargo test --manifest-path src-tauri/Cargo.toml
frontend-typecheck: frontend-typecheck:

View File

@ -19,7 +19,7 @@ tauri-plugin-shell = "2"
tauri-plugin-http = "2" tauri-plugin-http = "2"
tauri-plugin-cli = "2" tauri-plugin-cli = "2"
tauri-plugin-updater = "2" tauri-plugin-updater = "2"
rusqlite = { version = "0.31", features = ["bundled-sqlcipher"] } rusqlite = { version = "0.31", features = ["bundled-sqlcipher-vendored-openssl"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }