sarman/tftsr-devops_investigation
1
1
Fork 0
Code Issues 4 Pull Requests Actions 34 Packages Projects 3 Releases 6 Wiki Activity

fix(ci): use SODIUM_LIB_DIR to bypass pkg-config detection
Some checks failed
Test / frontend-tests (pull_request) Successful in 1m40s
Details
Test / frontend-typecheck (pull_request) Successful in 1m51s
Details
PR Review Automation / review (pull_request) Successful in 3m32s
Details
Test / rust-fmt-check (pull_request) Successful in 11m27s
Details
Test / rust-tests (pull_request) Failing after 11m53s
Details
Test / rust-clippy (pull_request) Failing after 11m55s
Details

Browse Source 
Directly specify libsodium library paths via SODIUM_LIB_DIR environment
variable instead of relying on pkg-config detection. This is the highest
priority method in libsodium-sys-stable's build.rs and bypasses all
pkg-config/vcpkg logic.

Platform-specific paths:
- Linux x86_64: /usr/lib/x86_64-linux-gnu
- Linux aarch64: /usr/lib/aarch64-linux-gnu
- Windows MinGW: /usr/x86_64-w64-mingw32/lib

Changes:
- test.yml: Add SODIUM_LIB_DIR to all cargo commands
- auto-tag.yml: Add SODIUM_LIB_DIR to all build jobs

This resolves "libsodium not found via pkg-config or vcpkg" by telling
the build script exactly where libsodium is installed.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Shaun Arman 2026-06-14 10:24:46 -05:00
parent bce0a3e696
commit 863868b2fc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitea/workflows/auto-tag.yml
View File

@ -344,6 +344,7 @@ jobs:
- name: Build - name: Build
env: env:
APPIMAGE_EXTRACT_AND_RUN: "1" APPIMAGE_EXTRACT_AND_RUN: "1"
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
run: | run: |
npm ci --legacy-peer-deps npm ci --legacy-peer-deps
CI=true npx tauri build --target x86_64-unknown-linux-gnu CI=true npx tauri build --target x86_64-unknown-linux-gnu
@ -444,8 +445,7 @@ 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"
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
@ -634,6 +634,7 @@ jobs:
OPENSSL_NO_VENDOR: "0" OPENSSL_NO_VENDOR: "0"
OPENSSL_STATIC: "1" OPENSSL_STATIC: "1"
APPIMAGE_EXTRACT_AND_RUN: "1" APPIMAGE_EXTRACT_AND_RUN: "1"
SODIUM_LIB_DIR: /usr/lib/aarch64-linux-gnu
run: | run: |
npm ci --legacy-peer-deps npm ci --legacy-peer-deps
CI=true npx tauri build --target aarch64-unknown-linux-gnu --bundles deb,rpm CI=true npx tauri build --target aarch64-unknown-linux-gnu --bundles deb,rpm

10
.gitea/workflows/test.yml
View File

@ -63,7 +63,11 @@ 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
@ -102,6 +106,8 @@ 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
@ -138,9 +144,13 @@ 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