sarman/tftsr-devops_investigation
1
1
Fork 0
Code Issues 4 Pull Requests Actions 34 Packages Projects 3 Releases 6 Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Shaun Arman 2026-06-17 20:20:39 -05:00
commit ec20f343c4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/auto-tag.yml
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

7
CHANGELOG.md
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