Merge pull request 'fix(ci): use env -u instead of unset to drop SODIUM_USE_PKG_CONFIG' (#113 ) from fix/env-u-sodium into beta

Reviewed-on: #113
fix(ci): use env -u instead of unset to drop SODIUM_USE_PKG_CONFIG
2026-06-18 02:09:02 +00:00 · 2026-06-17 20:35:50 -05:00
2 changed files with 6 additions and 12 deletions
--- a/.gitea/workflows/auto-tag.yml
+++ b/.gitea/workflows/auto-tag.yml
@ -346,9 +346,8 @@ 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
+          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-unknown-linux-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -448,9 +447,8 @@ jobs:
          OPENSSL_STATIC: "1"
          SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
        run: |
-          unset SODIUM_USE_PKG_CONFIG
          npm ci --legacy-peer-deps
-          CI=true npx tauri build --target x86_64-pc-windows-gnu
+          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-pc-windows-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -638,9 +636,8 @@ 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
+          env -u SODIUM_USE_PKG_CONFIG 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
@ -226,9 +226,8 @@ 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
+          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-unknown-linux-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -322,9 +321,8 @@ 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
+          env -u SODIUM_USE_PKG_CONFIG CI=true npx tauri build --target x86_64-pc-windows-gnu
      - name: Upload artifacts
        env:
          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@ -498,9 +496,8 @@ 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
+          env -u SODIUM_USE_PKG_CONFIG 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
sarman	cd7bea9ec5	Merge pull request 'fix(ci): use env -u instead of unset to drop SODIUM_USE_PKG_CONFIG' (#113 ) from fix/env-u-sodium into beta Some checks failed Release Beta / autotag (push) Successful in 14s Details Release Beta / changelog (push) Successful in 1m26s Details Test / frontend-tests (push) Successful in 1m53s Details Test / frontend-typecheck (push) Successful in 2m0s Details Release Beta / build-linux-amd64 (push) Failing after 5m4s Details Release Beta / build-windows-amd64 (push) Failing after 5m50s Details Release Beta / build-linux-arm64 (push) Failing after 5m54s Details Release Beta / build-macos-arm64 (push) Successful in 8m19s Details Test / rust-fmt-check (push) Has been cancelled Details Test / rust-tests (push) Has been cancelled Details Test / rust-clippy (push) Has been cancelled Details Reviewed-on: #113	2026-06-18 02:09:02 +00:00
Shaun Arman	0536a6767b	fix(ci): use env -u instead of unset to drop SODIUM_USE_PKG_CONFIG Some checks failed PR Review Automation / review (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-tests (pull_request) Has been cancelled Details Test / rust-fmt-check (pull_request) Has been cancelled Details Test / frontend-tests (pull_request) Has been cancelled Details bash unset modifies the current shell's environment but the act_runner at 172.0.0.29 re-injects runner-level environment variables before each cargo invocation, making unset ineffective. env -u removes the variable from the child process's environment at the exec() level, bypassing any runner re-injection entirely. Applies to all three non-macOS platforms (linux-amd64, windows-amd64, linux-arm64) in both release-beta.yml and auto-tag.yml.	2026-06-17 20:35:50 -05:00