Merge pull request 'fix(ci): correct SODIUM_LIB_DIR config in release-beta.yml' (#109 ) from fix/beta-sodium-libdir into beta

Reviewed-on: #109
fix(ci): correct SODIUM_LIB_DIR config in release-beta.yml
2026-06-18 00:48:49 +00:00 · 2026-06-17 19:46:58 -05:00
1 changed files with 2 additions and 1 deletions
--- a/.gitea/workflows/release-beta.yml
+++ b/.gitea/workflows/release-beta.yml
@ -224,6 +224,7 @@ jobs:
      - name: Build
        env:
          APPIMAGE_EXTRACT_AND_RUN: "1"
+          SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
        run: |
          npm ci --legacy-peer-deps
          CI=true npx tauri build --target x86_64-unknown-linux-gnu
@ -319,7 +320,6 @@ jobs:
          OPENSSL_STATIC: "1"
          SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
          SODIUM_STATIC: "1"
-          SODIUM_USE_PKG_CONFIG: "no"
        run: |
          npm ci --legacy-peer-deps
          CI=true npx tauri build --target x86_64-pc-windows-gnu
@ -494,6 +494,7 @@ jobs:
          OPENSSL_NO_VENDOR: "0"
          OPENSSL_STATIC: "1"
          APPIMAGE_EXTRACT_AND_RUN: "1"
+          SODIUM_LIB_DIR: /usr/lib/aarch64-linux-gnu
        run: |
          npm ci --legacy-peer-deps
          CI=true npx tauri build --target aarch64-unknown-linux-gnu --bundles deb,rpm
Author	SHA1	Message	Date
sarman	85f26225ba	Merge pull request 'fix(ci): correct SODIUM_LIB_DIR config in release-beta.yml' (#109 ) from fix/beta-sodium-libdir into beta Some checks failed Release Beta / autotag (push) Successful in 9s Details Test / frontend-tests (push) Successful in 1m49s Details Release Beta / changelog (push) Successful in 1m48s Details Test / frontend-typecheck (push) Successful in 1m58s Details Release Beta / build-linux-amd64 (push) Failing after 4m50s Details Release Beta / build-windows-amd64 (push) Failing after 5m29s Details Release Beta / build-linux-arm64 (push) Failing after 5m50s Details Release Beta / build-macos-arm64 (push) Successful in 11m26s Details Test / rust-fmt-check (push) Successful in 16m16s Details Test / rust-clippy (push) Successful in 18m11s Details Test / rust-tests (push) Successful in 20m1s Details Reviewed-on: #109	2026-06-18 00:48:49 +00:00
Shaun Arman	648adf082e	fix(ci): correct SODIUM_LIB_DIR config in release-beta.yml Some checks failed PR Review Automation / review (pull_request) Has been cancelled Details Test / rust-tests (pull_request) Has been cancelled Details Test / rust-fmt-check (pull_request) Has been cancelled Details Test / frontend-typecheck (pull_request) Has been cancelled Details Test / rust-clippy (pull_request) Has been cancelled Details Test / frontend-tests (pull_request) Has been cancelled Details Tested locally with Ubuntu 22.04 + libsodium-sys-stable 1.24.0: - No env vars → install_from_source() needs 'make', fails in slim containers - SODIUM_LIB_DIR alone → works when libsodium is installed in the image - SODIUM_LIB_DIR + SODIUM_USE_PKG_CONFIG → immediate panic (incompatible by design) Fixes three broken build targets introduced by the merge conflict resolution: - linux-amd64: was missing all sodium config, add SODIUM_LIB_DIR - windows: had SODIUM_LIB_DIR + SODIUM_USE_PKG_CONFIG (incompatible), remove the latter - linux-arm64: was missing sodium config, add SODIUM_LIB_DIR	2026-06-17 19:46:58 -05:00