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

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

Browse Source 
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.
This commit is contained in:
Shaun Arman 2026-06-14 05:34:47 -05:00
parent 44ba1bd4e7
commit 149f170435
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
LIBSODIUM_FIX_SUMMARY.md
View File

@ -42,6 +42,18 @@ The `libsodium-sys-stable` crate (dependency chain: `tauri-plugin-stronghold`
## Solution ## Solution
### Two-Phase Fix
This fix was implemented in two commits:
**Phase 1 (Commit `7316339a`):** Fixed Windows configuration and attempted Linux fixes with `SODIUM_USE_PKG_CONFIG=1`
- Windows: Changed `SODIUM_LIB_DIR` from `""` to `/usr/x86_64-w64-mingw32/lib` ✅
- Linux: Added `SODIUM_USE_PKG_CONFIG=1` ❌ (still failed)
**Phase 2 (Commit `44ba1bd4`):** Revised Linux approach to use vendored builds
- Linux: Removed `SODIUM_USE_PKG_CONFIG` to trigger vendored build from source ✅
- Windows: No changes (already correct from Phase 1)
### Revised Approach: Use Vendored libsodium Build ### Revised Approach: Use Vendored libsodium Build
After initial attempt with `SODIUM_USE_PKG_CONFIG=1` still failed (pkg-config couldn't find libsodium.pc in CI containers), switched to the **vendored build** approach: remove all SODIUM_* environment variables and let libsodium-sys-stable build from source. After initial attempt with `SODIUM_USE_PKG_CONFIG=1` still failed (pkg-config couldn't find libsodium.pc in CI containers), switched to the **vendored build** approach: remove all SODIUM_* environment variables and let libsodium-sys-stable build from source.
@ -66,15 +78,15 @@ env:
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
OPENSSL_NO_VENDOR: "0" OPENSSL_NO_VENDOR: "0"
OPENSSL_STATIC: "1" OPENSSL_STATIC: "1"
SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib # Changed from "" SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
SODIUM_STATIC: "1" # Changed from "yes" SODIUM_STATIC: "1"
SODIUM_USE_PKG_CONFIG: "no" # Added (explicit disable) SODIUM_USE_PKG_CONFIG: "no"
``` ```
**Why:** **Why:**
- Points `SODIUM_LIB_DIR` to the actual pre-built libsodium location (installed by Dockerfile.windows-cross) - Uses pre-built libsodium from Dockerfile.windows-cross (installed to `/usr/x86_64-w64-mingw32/lib`)
- Explicitly disables pkg-config to prevent conflict - Explicitly disables pkg-config to prevent conflict with SODIUM_LIB_DIR
- Standardizes `SODIUM_STATIC` to "1" (matches auto-tag.yml) - **Note:** This configuration was fixed in commit `7316339a` and remains unchanged in current commit
#### 3. Linux arm64 Build #### 3. Linux arm64 Build
```yaml ```yaml