From 69dae719f9c9a636239771df30eaf0ad0ae164bb Mon Sep 17 00:00:00 2001 From: Shaun Arman Date: Wed, 17 Jun 2026 19:12:31 -0500 Subject: [PATCH] fix(ci): align master libsodium config with beta to resolve merge conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #105 (beta) and PR #106 (master) independently fixed libsodium detection using different approaches, causing conflicts on every auto master→beta merge. Adopt beta's proven approach in auto-tag.yml and release-beta.yml: - linux-amd64: use SODIUM_LIB_DIR env var, remove runtime apt-get install - linux-arm64: use SODIUM_LIB_DIR / extended PKG_CONFIG_PATH, remove apt-get - windows: keep SODIUM_STATIC, add SODIUM_USE_PKG_CONFIG=no --- .gitea/workflows/auto-tag.yml | 7 +++---- .gitea/workflows/release-beta.yml | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/auto-tag.yml b/.gitea/workflows/auto-tag.yml index eb6b1c82..f4bf0f89 100644 --- a/.gitea/workflows/auto-tag.yml +++ b/.gitea/workflows/auto-tag.yml @@ -344,8 +344,8 @@ jobs: - name: Build env: APPIMAGE_EXTRACT_AND_RUN: "1" + SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu run: | - apt-get update -qq && apt-get install -y --no-install-recommends libsodium-dev npm ci --legacy-peer-deps CI=true npx tauri build --target x86_64-unknown-linux-gnu - name: Upload artifacts @@ -446,7 +446,6 @@ jobs: OPENSSL_NO_VENDOR: "0" OPENSSL_STATIC: "1" SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib - SODIUM_STATIC: "1" run: | npm ci --legacy-peer-deps CI=true npx tauri build --target x86_64-pc-windows-gnu @@ -630,13 +629,13 @@ jobs: AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc PKG_CONFIG_SYSROOT_DIR: /usr/aarch64-linux-gnu - PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig + PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig:/usr/aarch64-linux-gnu/lib/pkgconfig PKG_CONFIG_ALLOW_CROSS: "1" OPENSSL_NO_VENDOR: "0" OPENSSL_STATIC: "1" APPIMAGE_EXTRACT_AND_RUN: "1" + SODIUM_LIB_DIR: /usr/lib/aarch64-linux-gnu run: | - apt-get update -qq && apt-get install -y --no-install-recommends libsodium-dev:arm64 npm ci --legacy-peer-deps CI=true npx tauri build --target aarch64-unknown-linux-gnu --bundles deb,rpm - name: Upload artifacts diff --git a/.gitea/workflows/release-beta.yml b/.gitea/workflows/release-beta.yml index babbd527..71d4cf60 100644 --- a/.gitea/workflows/release-beta.yml +++ b/.gitea/workflows/release-beta.yml @@ -225,7 +225,6 @@ jobs: env: APPIMAGE_EXTRACT_AND_RUN: "1" run: | - apt-get update -qq && apt-get install -y --no-install-recommends libsodium-dev npm ci --legacy-peer-deps CI=true npx tauri build --target x86_64-unknown-linux-gnu - name: Upload artifacts @@ -320,6 +319,7 @@ 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 @@ -489,13 +489,12 @@ jobs: AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc PKG_CONFIG_SYSROOT_DIR: /usr/aarch64-linux-gnu - PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig + PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig:/usr/aarch64-linux-gnu/lib/pkgconfig PKG_CONFIG_ALLOW_CROSS: "1" OPENSSL_NO_VENDOR: "0" OPENSSL_STATIC: "1" APPIMAGE_EXTRACT_AND_RUN: "1" run: | - apt-get update -qq && apt-get install -y --no-install-recommends libsodium-dev:arm64 npm ci --legacy-peer-deps CI=true npx tauri build --target aarch64-unknown-linux-gnu --bundles deb,rpm - name: Upload artifacts