chore: merge master into beta — resolve SODIUM_USE_PKG_CONFIG conflict in auto-tag.yml #112

Merged
sarman merged 5 commits from fix/sync-master-sodium-unset into beta 2026-06-18 01:21:52 +00:00
2 changed files with 10 additions and 0 deletions

View File

@ -346,6 +346,7 @@ jobs:
APPIMAGE_EXTRACT_AND_RUN: "1" APPIMAGE_EXTRACT_AND_RUN: "1"
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
run: | run: |
unset SODIUM_USE_PKG_CONFIG
npm ci --legacy-peer-deps npm ci --legacy-peer-deps
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 - name: Upload artifacts
@ -447,6 +448,7 @@ jobs:
OPENSSL_STATIC: "1" OPENSSL_STATIC: "1"
SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
run: | run: |
unset SODIUM_USE_PKG_CONFIG
npm ci --legacy-peer-deps npm ci --legacy-peer-deps
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 - name: Upload artifacts
@ -636,6 +638,7 @@ jobs:
APPIMAGE_EXTRACT_AND_RUN: "1" APPIMAGE_EXTRACT_AND_RUN: "1"
SODIUM_LIB_DIR: /usr/lib/aarch64-linux-gnu SODIUM_LIB_DIR: /usr/lib/aarch64-linux-gnu
run: | run: |
unset SODIUM_USE_PKG_CONFIG
npm ci --legacy-peer-deps npm ci --legacy-peer-deps
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 - name: Upload artifacts

View File

@ -4,6 +4,13 @@ All notable changes to TRCAA are documented here.
Commit types shown: feat, fix, perf, docs, refactor. Commit types shown: feat, fix, perf, docs, refactor.
CI, chore, and build changes are excluded. 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 ## [1.2.3] — 2026-06-13
### Bug Fixes ### Bug Fixes