Merge pull request 'fix(ci): unset SODIUM_USE_PKG_CONFIG before cargo builds (beta)' (#110 ) from fix/unset-sodium-pkg-config-beta into beta

Reviewed-on: #110
fix(ci): unset SODIUM_USE_PKG_CONFIG before cargo builds on all platforms
2026-06-18 01:23:08 +00:00 · 2026-06-17 20:22:35 -05:00
1 changed files with 3 additions and 0 deletions
--- a/.gitea/workflows/release-beta.yml
+++ b/.gitea/workflows/release-beta.yml
@ -226,6 +226,7 @@ jobs:
          APPIMAGE_EXTRACT_AND_RUN: "1"
          SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
        run: |
          unset SODIUM_USE_PKG_CONFIG
          npm ci --legacy-peer-deps
          CI=true npx tauri build --target x86_64-unknown-linux-gnu
      - name: Upload artifacts
@ -321,6 +322,7 @@ jobs:
          SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
          SODIUM_STATIC: "1"
        run: |
          unset SODIUM_USE_PKG_CONFIG
          npm ci --legacy-peer-deps
          CI=true npx tauri build --target x86_64-pc-windows-gnu
      - name: Upload artifacts
@ -496,6 +498,7 @@ jobs:
          APPIMAGE_EXTRACT_AND_RUN: "1"
          SODIUM_LIB_DIR: /usr/lib/aarch64-linux-gnu
        run: |
          unset SODIUM_USE_PKG_CONFIG
          npm ci --legacy-peer-deps
          CI=true npx tauri build --target aarch64-unknown-linux-gnu --bundles deb,rpm
      - name: Upload artifacts
Author	SHA1	Message	Date
sarman	a49fbd7ebe	Merge pull request 'fix(ci): unset SODIUM_USE_PKG_CONFIG before cargo builds (beta)' (#110 ) from fix/unset-sodium-pkg-config-beta into beta Some checks failed Release Beta / autotag (push) Successful in 9s Details Test / frontend-tests (push) Successful in 1m49s Details Test / frontend-typecheck (push) Successful in 1m58s Details Release Beta / changelog (push) Successful in 1m53s Details Release Beta / build-linux-amd64 (push) Failing after 4m54s Details Release Beta / build-windows-amd64 (push) Failing after 5m31s Details Release Beta / build-linux-arm64 (push) Failing after 5m50s Details Release Beta / build-macos-arm64 (push) Successful in 8m13s Details Test / rust-fmt-check (push) Successful in 15m32s Details Test / rust-clippy (push) Successful in 17m32s Details Test / rust-tests (push) Successful in 19m24s Details Reviewed-on: #110	2026-06-18 01:23:08 +00:00
Shaun Arman	fffd0b7400	fix(ci): unset SODIUM_USE_PKG_CONFIG before cargo builds on all platforms Some checks failed PR Review Automation / review (pull_request) Has been cancelled Details Test / frontend-tests (pull_request) Has been cancelled Details Test / rust-tests (pull_request) Has been cancelled Details Test / rust-clippy (pull_request) Has been cancelled Details Test / frontend-typecheck (pull_request) Has been cancelled Details Test / rust-fmt-check (pull_request) Has been cancelled Details The libsodium-sys-stable build.rs panics if both SODIUM_LIB_DIR and SODIUM_USE_PKG_CONFIG are set simultaneously. The runner infrastructure at 172.0.0.29 has SODIUM_USE_PKG_CONFIG in its container environment (not traceable to any workflow file or Docker image ENV layer), which conflicts with the SODIUM_LIB_DIR approach used for cross-compilation. Explicitly unset SODIUM_USE_PKG_CONFIG in the shell before npm/cargo runs on all three platforms (linux-amd64, windows-amd64, linux-arm64) in both release-beta.yml and auto-tag.yml. This is a defensive no-op when the variable is absent, and a clean fix when it is present.	2026-06-17 20:22:35 -05:00