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

fix(ci): align master libsodium config with beta to resolve merge conflict #107

Closed
sarman wants to merge 1 commits from fix/resolve-libsodium-merge-conflict into master
pull from: fix/resolve-libsodium-merge-conflict
merge into: sarman:master
Conversation 0 Commits 1 Files Changed 2 +5 -7

1 Commits

Author SHA1 Message Date
Shaun Arman
69dae719f9 fix(ci): align master libsodium config with beta to resolve merge conflict
Some checks failed
Test / frontend-tests (pull_request) Successful in 1m40s
Details
Test / frontend-typecheck (pull_request) Successful in 1m49s
Details
Test / rust-fmt-check (pull_request) Has been cancelled
Details
Test / rust-tests (pull_request) Has been cancelled
Details
Test / rust-clippy (pull_request) Has been cancelled
Details
PR Review Automation / review (pull_request) Has been cancelled
Details 
PR #105 (beta) and PR #106 (master) independently fixed libsodium detection
using different approaches, causing conflicts on every auto master→beta merge.

Adopt beta's proven approach in auto-tag.yml and release-beta.yml:
- linux-amd64: use SODIUM_LIB_DIR env var, remove runtime apt-get install
- linux-arm64: use SODIUM_LIB_DIR / extended PKG_CONFIG_PATH, remove apt-get
- windows: keep SODIUM_STATIC, add SODIUM_USE_PKG_CONFIG=no
 2026-06-17 19:12:31 -05:00