From 648adf082e77a389d74e37cfb2f2042365f89af9 Mon Sep 17 00:00:00 2001 From: Shaun Arman Date: Wed, 17 Jun 2026 19:46:58 -0500 Subject: [PATCH] fix(ci): correct SODIUM_LIB_DIR config in release-beta.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .gitea/workflows/release-beta.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/release-beta.yml b/.gitea/workflows/release-beta.yml index 71d4cf60..35d8c01e 100644 --- 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 -- 2.45.2