fix(ci): use SODIUM_LIB_DIR to bypass pkg-config detection #105

Merged
sarman merged 4 commits from fix/libsodium-direct-path into beta 2026-06-14 20:04:47 +00:00
Showing only changes of commit 1172f20137 - Show all commits

View File

@ -12,6 +12,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: rustlang/rust:nightly image: rustlang/rust:nightly
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
steps: steps:
- name: Checkout - name: Checkout
run: | run: |
@ -63,16 +65,14 @@ jobs:
- name: Update version from Git - name: Update version from Git
run: node scripts/update-version.mjs run: node scripts/update-version.mjs
- run: cargo generate-lockfile --manifest-path src-tauri/Cargo.toml - run: cargo generate-lockfile --manifest-path src-tauri/Cargo.toml
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
- run: cargo fmt --manifest-path src-tauri/Cargo.toml --check - run: cargo fmt --manifest-path src-tauri/Cargo.toml --check
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
rust-clippy: rust-clippy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: rustlang/rust:nightly image: rustlang/rust:nightly
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
steps: steps:
- name: Checkout - name: Checkout
run: | run: |
@ -106,13 +106,13 @@ jobs:
- name: Install clippy - name: Install clippy
run: rustup component add clippy run: rustup component add clippy
- run: cargo clippy --manifest-path src-tauri/Cargo.toml -- -D warnings - run: cargo clippy --manifest-path src-tauri/Cargo.toml -- -D warnings
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
rust-tests: rust-tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: rustlang/rust:nightly image: rustlang/rust:nightly
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
steps: steps:
- name: Checkout - name: Checkout
run: | run: |
@ -144,13 +144,9 @@ jobs:
libsodium-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
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
- name: Run shell module tests - name: Run shell module tests
run: 'cargo test --manifest-path src-tauri/Cargo.toml "shell::" -- --test-threads=1' run: 'cargo test --manifest-path src-tauri/Cargo.toml "shell::" -- --test-threads=1'
env:
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
frontend-typecheck: frontend-typecheck:
runs-on: ubuntu-latest runs-on: ubuntu-latest