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

fix(ci): use vendored libsodium build instead of pkg-config #103

Merged
sarman merged 2 commits from fix/libsodium-ci-all-platforms into beta 2026-06-14 10:43:08 +00:00
Conversation 1 Commits 2 Files Changed 3 +30 -22

2 Commits

Author SHA1 Message Date
Shaun Arman
149f170435 docs: clarify two-phase fix approach in summary
Some checks failed
Test / frontend-tests (pull_request) Successful in 1m46s
Details
Test / frontend-typecheck (pull_request) Successful in 1m55s
Details
PR Review Automation / review (pull_request) Successful in 3m42s
Details
Test / rust-clippy (pull_request) Has been cancelled
Details
Test / rust-fmt-check (pull_request) Has been cancelled
Details
Test / rust-tests (pull_request) Has been cancelled
Details 
The automated reviewer was confused by comments like 'Changed from' in
the Windows section, which implied this commit changed Windows config.

Clarified that:
- Phase 1 (commit 7316339a): Fixed Windows, attempted Linux with pkg-config
- Phase 2 (commit 44ba1bd4): Revised Linux to use vendored builds
- Windows config was fixed in Phase 1 and unchanged in Phase 2

This should resolve the automated reviewer's concern about Windows
configuration appearing incomplete.
 2026-06-14 05:34:47 -05:00
Shaun Arman
44ba1bd4e7 fix(ci): use vendored libsodium build instead of pkg-config
All checks were successful
Test / frontend-tests (pull_request) Successful in 1m45s
Details
Test / frontend-typecheck (pull_request) Successful in 1m52s
Details
PR Review Automation / review (pull_request) Successful in 3m54s
Details
Test / rust-fmt-check (pull_request) Successful in 12m41s
Details
Test / rust-clippy (pull_request) Successful in 14m10s
Details
Test / rust-tests (pull_request) Successful in 16m1s
Details 
## Problem
Previous approach with SODIUM_USE_PKG_CONFIG=1 still failed:
"libsodium not found via pkg-config or vcpkg"

pkg-config couldn't locate libsodium.pc in CI containers despite
libsodium-dev being installed.

## Solution
Use vendored build approach: Remove all SODIUM_* environment variables
and let libsodium-sys-stable build from source automatically.

## Changes
- **release-beta.yml**: Removed SODIUM_USE_PKG_CONFIG from linux-amd64 and linux-arm64
- **auto-tag.yml**: Removed SODIUM_USE_PKG_CONFIG from linux-amd64 and linux-arm64
- **Windows**: Kept SODIUM_LIB_DIR approach (uses pre-built from Dockerfile)

## Why This Works
libsodium-sys-stable build priority:
1. SODIUM_LIB_DIR (if set) → use pre-built
2. SODIUM_USE_PKG_CONFIG (if set) → use pkg-config
3. Neither set → build from source (vendored) ✅

Vendored builds are more reliable in CI as they don't depend on
system package installation or pkg-config configuration.

## Validation
✅ Local clean build with vendored libsodium: passed
⏳ CI validation: pending

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
 2026-06-14 04:48:51 -05:00