Merge pull request 'chore: merge master into beta — resolve SODIUM_USE_PKG_CONFIG conflict in auto-tag.yml' (#112 ) from fix/sync-master-sodium-unset into beta

Reviewed-on: #112
chore: merge master into beta — resolve SODIUM_USE_PKG_CONFIG conflict in auto-tag.yml
2026-06-18 01:21:51 +00:00 · 2026-06-17 20:20:39 -05:00 · 2026-06-18 01:17:21 +00:00 · 2026-06-18 01:14:15 +00:00 · 2026-06-17 20:12:04 -05:00 · 2026-06-18 00:09:15 +00:00
2 changed files with 10 additions and 0 deletions
--- a/.gitea/workflows/auto-tag.yml
+++ b/.gitea/workflows/auto-tag.yml
@ -346,6 +346,7 @@ 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
      - name: Upload artifacts
@ -447,6 +448,7 @@ 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
      - name: Upload artifacts
@ -636,6 +638,7 @@ 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
      - name: Upload artifacts
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,13 @@ All notable changes to TRCAA are documented here.
 Commit types shown: feat, fix, perf, docs, refactor.
 CI, chore, and build changes are excluded.

+## [Unreleased]
+
+### Bug Fixes
+- Register missing updater commands
+- **ci**: Add libsodium to all build environments
+- **ci**: Unset SODIUM_USE_PKG_CONFIG and use SODIUM_LIB_DIR in auto-tag.yml
+
 ## [1.2.3] — 2026-06-13

 ### Bug Fixes
Author	SHA1	Message	Date
sarman	721192edb0	Merge pull request 'chore: merge master into beta — resolve SODIUM_USE_PKG_CONFIG conflict in auto-tag.yml' (#112 ) from fix/sync-master-sodium-unset into beta Some checks failed Release Beta / changelog (push) Has been cancelled Details Release Beta / build-linux-amd64 (push) Has been cancelled Details Release Beta / build-windows-amd64 (push) Has been cancelled Details Release Beta / build-macos-arm64 (push) Has been cancelled Details Release Beta / build-linux-arm64 (push) Has been cancelled Details Release Beta / autotag (push) Has been cancelled Details Test / frontend-typecheck (push) Has been cancelled Details Test / rust-tests (push) Has been cancelled Details Test / frontend-tests (push) Has been cancelled Details Test / rust-clippy (push) Has been cancelled Details Test / rust-fmt-check (push) Has been cancelled Details Reviewed-on: #112	2026-06-18 01:21:51 +00:00
Shaun Arman	ec20f343c4	chore: merge master into beta — resolve SODIUM_USE_PKG_CONFIG conflict in auto-tag.yml Some checks failed PR Review Automation / review (pull_request) Has been cancelled Details Test / rust-clippy (pull_request) Has been cancelled Details Test / rust-tests (pull_request) Has been cancelled Details Test / frontend-typecheck (pull_request) Has been cancelled Details Test / frontend-tests (pull_request) Has been cancelled Details Test / rust-fmt-check (pull_request) Has been cancelled Details Master added `unset SODIUM_USE_PKG_CONFIG` to the linux-amd64 and linux-arm64 build steps in auto-tag.yml (PR #111). Beta's copy of auto-tag.yml was already ahead of master via the previous sync but lacked those two unset lines, causing a line-level conflict. Resolution: take master's version in both conflict regions, adding the unset to both linux build steps. All three platforms (amd64, Windows, arm64) now have consistent SODIUM_LIB_DIR + unset configuration.	2026-06-17 20:20:39 -05:00
gitea-actions[bot]	7ae39bc050	chore: update CHANGELOG.md for v1.2.3 [skip ci]	2026-06-18 01:17:21 +00:00
sarman	df833e8464	Merge pull request 'fix(ci): unset SODIUM_USE_PKG_CONFIG and use SODIUM_LIB_DIR in auto-tag.yml' (#111 ) from fix/unset-sodium-pkg-config-master into master Some checks failed Auto Tag / autotag (push) Successful in 16s Details Auto Tag / wiki-sync (push) Successful in 15s Details Sync Beta from Master / sync (push) Failing after 1m9s Details Test / frontend-tests (push) Successful in 1m40s Details Test / frontend-typecheck (push) Successful in 1m55s Details Auto Tag / changelog (push) Successful in 1m59s Details Auto Tag / build-macos-arm64 (push) Successful in 5m37s Details Auto Tag / build-linux-amd64 (push) Failing after 4m38s Details Test / rust-clippy (push) Has been cancelled Details Test / rust-fmt-check (push) Has been cancelled Details Test / rust-tests (push) Has been cancelled Details Auto Tag / build-linux-arm64 (push) Has been cancelled Details Auto Tag / build-windows-amd64 (push) Has been cancelled Details Reviewed-on: #111	2026-06-18 01:14:15 +00:00
Shaun Arman	a15e69413a	fix(ci): unset SODIUM_USE_PKG_CONFIG and use SODIUM_LIB_DIR in auto-tag.yml Some checks failed PR Review Automation / review (pull_request) Has been cancelled Details Test / rust-tests (pull_request) Has been cancelled Details Test / frontend-typecheck (pull_request) Has been cancelled Details Test / frontend-tests (pull_request) Has been cancelled Details Test / rust-clippy (pull_request) Has been cancelled Details Test / rust-fmt-check (pull_request) Has been cancelled Details The libsodium-sys-stable build.rs panics when both SODIUM_LIB_DIR and SODIUM_USE_PKG_CONFIG are set simultaneously. The runner environment at 172.0.0.29 has SODIUM_USE_PKG_CONFIG set (not traceable to any workflow file or Docker image ENV layer), which conflicts with any step that sets SODIUM_LIB_DIR. For all three platform builds (linux-amd64, windows-amd64, linux-arm64): - Add `unset SODIUM_USE_PKG_CONFIG` to the shell before cargo runs - Switch Linux builds from inline apt-get to SODIUM_LIB_DIR (Docker images already include libsodium-dev, removing the redundant install) - Extend arm64 PKG_CONFIG_PATH to include /usr/aarch64-linux-gnu/lib/pkgconfig (matching the beta workflow for consistency) The unset is a no-op when the variable is absent; it cleanly clears any ambient value injected by the runner infrastructure.	2026-06-17 20:12:04 -05:00
gitea-actions[bot]	0550066e70	chore: update CHANGELOG.md for v1.2.3 [skip ci]	2026-06-18 00:09:15 +00:00