From 1f062948fc8a64c97556b34a6a4960a35c08e945 Mon Sep 17 00:00:00 2001 From: Shaun Arman Date: Sun, 15 Mar 2026 19:17:36 -0500 Subject: [PATCH] fix: use bundled-sqlcipher-vendored-openssl for portable Windows cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SQLCipher requires OpenSSL when cross-compiling for Windows with mingw-w64. bundled-sqlcipher-vendored-openssl compiles OpenSSL from source — no system OpenSSL needed for any target. Add perl to CI steps (required by OpenSSL build). --- .woodpecker/release.yml | 4 ++-- .woodpecker/test.yml | 4 ++-- src-tauri/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml index 1d4fd0dd..6085ef42 100644 --- a/.woodpecker/release.yml +++ b/.woodpecker/release.yml @@ -23,7 +23,7 @@ pipeline: when: event: tag 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 - - apt-get install -y nodejs - npm ci --legacy-peer-deps @@ -44,7 +44,7 @@ pipeline: when: event: tag 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 - - apt-get install -y nodejs - npm ci --legacy-peer-deps diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index 63fbc673..fb2dd924 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -16,14 +16,14 @@ pipeline: rust-clippy: image: rust:1.88-slim 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 - cargo clippy --manifest-path src-tauri/Cargo.toml -- -D warnings rust-tests: image: rust:1.88-slim 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 frontend-typecheck: diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 95a117a0..aee6ba38 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ tauri-plugin-shell = "2" tauri-plugin-http = "2" tauri-plugin-cli = "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_json = "1" tokio = { version = "1", features = ["full"] }