fix(ci): enable libsodium pkg-config feature across all platforms #104

Merged
sarman merged 2 commits from fix/libsodium-use-pkg-config into beta 2026-06-14 14:23:35 +00:00
4 changed files with 7 additions and 3 deletions

View File

@ -444,9 +444,8 @@ jobs:
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
OPENSSL_NO_VENDOR: "0"
OPENSSL_STATIC: "1"
SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
SODIUM_STATIC: "1"
SODIUM_USE_PKG_CONFIG: "no"
PKG_CONFIG_x86_64_pc_windows_gnu: x86_64-w64-mingw32-pkg-config
PKG_CONFIG_ALLOW_CROSS: "1"
run: |
npm ci --legacy-peer-deps
CI=true npx tauri build --target x86_64-pc-windows-gnu

View File

@ -45,6 +45,7 @@ jobs:
libayatana-appindicator3-dev \
librsvg2-dev \
libdbus-1-dev \
libsodium-dev \
pkg-config
- name: Install Rust components
run: rustup component add rustfmt
@ -96,6 +97,7 @@ jobs:
libayatana-appindicator3-dev \
librsvg2-dev \
libdbus-1-dev \
libsodium-dev \
pkg-config
- name: Install clippy
run: rustup component add clippy
@ -133,6 +135,7 @@ jobs:
libayatana-appindicator3-dev \
librsvg2-dev \
libdbus-1-dev \
libsodium-dev \
pkg-config
- run: cargo test --manifest-path src-tauri/Cargo.toml -- --test-threads=1

1
src-tauri/Cargo.lock generated
View File

@ -6545,6 +6545,7 @@ dependencies = [
"http 1.4.1",
"infer 0.15.0",
"lazy_static",
"libsodium-sys-stable",
"lopdf",
"mockito",
"portable-pty",

View File

@ -59,6 +59,7 @@ http = "1.4"
flate2 = { version = "1", features = ["rust_backend"] }
serde_yaml = "0.9"
portable-pty = "0.8"
libsodium-sys-stable = { version = "1.24", features = ["use-pkg-config"] }