Compare commits
No commits in common. "bce0a3e696c5fc3ae4d5ad7c914dfad98070b1ad" and "93201fbfb7d297006ea472b85f7665a1e9ba6934" have entirely different histories.
bce0a3e696
...
93201fbfb7
@ -444,8 +444,9 @@ jobs:
|
|||||||
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
|
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
|
||||||
OPENSSL_NO_VENDOR: "0"
|
OPENSSL_NO_VENDOR: "0"
|
||||||
OPENSSL_STATIC: "1"
|
OPENSSL_STATIC: "1"
|
||||||
PKG_CONFIG_x86_64_pc_windows_gnu: x86_64-w64-mingw32-pkg-config
|
SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
|
||||||
PKG_CONFIG_ALLOW_CROSS: "1"
|
SODIUM_STATIC: "1"
|
||||||
|
SODIUM_USE_PKG_CONFIG: "no"
|
||||||
run: |
|
run: |
|
||||||
npm ci --legacy-peer-deps
|
npm ci --legacy-peer-deps
|
||||||
CI=true npx tauri build --target x86_64-pc-windows-gnu
|
CI=true npx tauri build --target x86_64-pc-windows-gnu
|
||||||
|
|||||||
@ -45,7 +45,6 @@ jobs:
|
|||||||
libayatana-appindicator3-dev \
|
libayatana-appindicator3-dev \
|
||||||
librsvg2-dev \
|
librsvg2-dev \
|
||||||
libdbus-1-dev \
|
libdbus-1-dev \
|
||||||
libsodium-dev \
|
|
||||||
pkg-config
|
pkg-config
|
||||||
- name: Install Rust components
|
- name: Install Rust components
|
||||||
run: rustup component add rustfmt
|
run: rustup component add rustfmt
|
||||||
@ -97,7 +96,6 @@ jobs:
|
|||||||
libayatana-appindicator3-dev \
|
libayatana-appindicator3-dev \
|
||||||
librsvg2-dev \
|
librsvg2-dev \
|
||||||
libdbus-1-dev \
|
libdbus-1-dev \
|
||||||
libsodium-dev \
|
|
||||||
pkg-config
|
pkg-config
|
||||||
- name: Install clippy
|
- name: Install clippy
|
||||||
run: rustup component add clippy
|
run: rustup component add clippy
|
||||||
@ -135,7 +133,6 @@ jobs:
|
|||||||
libayatana-appindicator3-dev \
|
libayatana-appindicator3-dev \
|
||||||
librsvg2-dev \
|
librsvg2-dev \
|
||||||
libdbus-1-dev \
|
libdbus-1-dev \
|
||||||
libsodium-dev \
|
|
||||||
pkg-config
|
pkg-config
|
||||||
- run: cargo test --manifest-path src-tauri/Cargo.toml -- --test-threads=1
|
- run: cargo test --manifest-path src-tauri/Cargo.toml -- --test-threads=1
|
||||||
|
|
||||||
|
|||||||
1
src-tauri/Cargo.lock
generated
1
src-tauri/Cargo.lock
generated
@ -6545,7 +6545,6 @@ dependencies = [
|
|||||||
"http 1.4.1",
|
"http 1.4.1",
|
||||||
"infer 0.15.0",
|
"infer 0.15.0",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libsodium-sys-stable",
|
|
||||||
"lopdf",
|
"lopdf",
|
||||||
"mockito",
|
"mockito",
|
||||||
"portable-pty",
|
"portable-pty",
|
||||||
|
|||||||
@ -59,7 +59,6 @@ http = "1.4"
|
|||||||
flate2 = { version = "1", features = ["rust_backend"] }
|
flate2 = { version = "1", features = ["rust_backend"] }
|
||||||
serde_yaml = "0.9"
|
serde_yaml = "0.9"
|
||||||
portable-pty = "0.8"
|
portable-pty = "0.8"
|
||||||
libsodium-sys-stable = { version = "1.24", features = ["use-pkg-config"] }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user