fix(ci): install libsodium-dev in release-beta build jobs

fix(ci): install libsodium-dev in build jobs instead of using SODIUM_LIB_DIR hacks
Merge pull request 'fix(build): remove SODIUM_USE_PKG_CONFIG from .cargo/config.toml [env] block' (#114 ) from fix/cargo-config-sodium into beta
2026-06-18 21:12:14 -05:00 · 2026-06-18 21:12:14 -05:00 · 2026-06-18 02:24:58 +00:00
2 changed files with 24 additions and 13 deletions
--- a/.gitea/workflows/auto-tag.yml
+++ b/.gitea/workflows/auto-tag.yml
@ -341,13 +341,15 @@ jobs:
          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
          restore-keys: |
            ${{ runner.os }}-npm-
+      - name: Install libsodium
+        run: |
+          apt-get update && apt-get install -y libsodium-dev pkg-config
      - name: Build
        env:
          APPIMAGE_EXTRACT_AND_RUN: "1"
-          SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
        run: |
          npm ci --legacy-peer-deps
-          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-unknown-linux-gnu
+          CI=true npx tauri build --target x86_64-unknown-linux-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -437,6 +439,9 @@ jobs:
          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
          restore-keys: |
            ${{ runner.os }}-npm-
+      - name: Install libsodium
+        run: |
+          apt-get update && apt-get install -y libsodium-dev pkg-config
      - name: Build
        env:
          CC_x86_64_pc_windows_gnu: x86_64-w64-mingw32-gcc
@ -445,10 +450,9 @@ jobs:
          CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
          OPENSSL_NO_VENDOR: "0"
          OPENSSL_STATIC: "1"
-          SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
        run: |
          npm ci --legacy-peer-deps
-          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-pc-windows-gnu
+          CI=true npx tauri build --target x86_64-pc-windows-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -622,6 +626,9 @@ jobs:
          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
          restore-keys: |
            ${{ runner.os }}-npm-
+      - name: Install libsodium
+        run: |
+          apt-get update && apt-get install -y libsodium-dev pkg-config libssl-dev
      - name: Build
        env:
          CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
@ -634,10 +641,9 @@ 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
-          env -u SODIUM_USE_PKG_CONFIG 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
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
--- a/.gitea/workflows/release-beta.yml
+++ b/.gitea/workflows/release-beta.yml
@ -221,13 +221,15 @@ jobs:
          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
          restore-keys: |
            ${{ runner.os }}-npm-
+      - name: Install libsodium
+        run: |
+          apt-get update && apt-get install -y libsodium-dev pkg-config
      - name: Build
        env:
          APPIMAGE_EXTRACT_AND_RUN: "1"
-          SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
        run: |
          npm ci --legacy-peer-deps
-          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-unknown-linux-gnu
+          CI=true npx tauri build --target x86_64-unknown-linux-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -310,6 +312,9 @@ jobs:
          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
          restore-keys: |
            ${{ runner.os }}-npm-
+      - name: Install libsodium
+        run: |
+          apt-get update && apt-get install -y libsodium-dev pkg-config
      - name: Build
        env:
          CC_x86_64_pc_windows_gnu: x86_64-w64-mingw32-gcc
@ -318,11 +323,9 @@ jobs:
          CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
          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
-          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-pc-windows-gnu
+          CI=true npx tauri build --target x86_64-pc-windows-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -482,6 +485,9 @@ jobs:
          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
          restore-keys: |
            ${{ runner.os }}-npm-
+      - name: Install libsodium
+        run: |
+          apt-get update && apt-get install -y libsodium-dev pkg-config libssl-dev
      - name: Build
        env:
          CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
@ -494,10 +500,9 @@ 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
-          env -u SODIUM_USE_PKG_CONFIG 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
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
Author	SHA1	Message	Date
Shaun Arman	10fefe3088	fix(ci): install libsodium-dev in release-beta build jobs Some checks failed Test / frontend-tests (pull_request) Successful in 1m50s Details Test / rust-tests (pull_request) Has been cancelled Details Test / frontend-typecheck (pull_request) Successful in 2m1s Details PR Review Automation / review (pull_request) Failing after 4m23s Details Test / rust-fmt-check (pull_request) Has been cancelled Details Test / rust-clippy (pull_request) Has been cancelled Details	2026-06-18 21:12:14 -05:00
Shaun Arman	fa54c5ee4e	fix(ci): install libsodium-dev in build jobs instead of using SODIUM_LIB_DIR hacks	2026-06-18 21:12:14 -05:00
sarman	ee909c9cf5	Merge pull request 'fix(build): remove SODIUM_USE_PKG_CONFIG from .cargo/config.toml [env] block' (#114 ) from fix/cargo-config-sodium into beta Some checks failed Release Beta / autotag (push) Successful in 22s Details Test / frontend-tests (push) Successful in 1m56s Details Release Beta / changelog (push) Successful in 1m41s Details Test / frontend-typecheck (push) Successful in 2m5s Details Release Beta / build-linux-amd64 (push) Failing after 5m34s Details Release Beta / build-linux-arm64 (push) Failing after 6m31s Details Release Beta / build-windows-amd64 (push) Successful in 12m20s Details Test / rust-fmt-check (push) Successful in 15m50s Details Test / rust-clippy (push) Successful in 17m51s Details Test / rust-tests (push) Successful in 19m43s Details Release Beta / build-macos-arm64 (push) Failing after 11m41s Details Renovate / renovate (push) Failing after 28s Details Reviewed-on: #114	2026-06-18 02:24:58 +00:00