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

chore: merge master into beta — resolve libsodium workflow conflicts #108

Merged
sarman merged 5 commits from fix/sync-master-to-beta into beta 2026-06-18 00:21:23 +00:00
Conversation 0 Commits 5 Files Changed 3 +46 -1
sarman commented 2026-06-18 00:19:56 +00:00
Owner
Copy Link

Summary

  • Manually resolves the merge conflict from CI run #947
  • Two independent libsodium fixes (PR #105 on beta, PR #106 on master) diverged on the same lines in auto-tag.yml and release-beta.yml
  • Keeps beta's proven approach: SODIUM_LIB_DIR env vars, no runtime apt-get install libsodium
  • Also carries forward master's Dockerfile.linux-arm64 libsodium addition and CHANGELOG update

Test plan

  • CI passes on this PR
  • After merge, next push to master auto-syncs to beta without conflict
  • Beta release pipeline (release-beta.yml) builds successfully
## Summary - Manually resolves the merge conflict from CI run #947 - Two independent libsodium fixes (PR #105 on beta, PR #106 on master) diverged on the same lines in `auto-tag.yml` and `release-beta.yml` - Keeps beta's proven approach: `SODIUM_LIB_DIR` env vars, no runtime `apt-get install libsodium` - Also carries forward master's `Dockerfile.linux-arm64` libsodium addition and CHANGELOG update ## Test plan - [ ] CI passes on this PR - [ ] After merge, next push to master auto-syncs to beta without conflict - [ ] Beta release pipeline (release-beta.yml) builds successfully
sarman added 5 commits 2026-06-18 00:19:57 +00:00
fix(ci): add libsodium to all build environments
Some checks failed
PR Review Automation / review (pull_request) Has been cancelled
Details
Test / rust-clippy (pull_request) Has been cancelled
Details
Test / rust-fmt-check (pull_request) Has been cancelled
Details
Test / frontend-tests (pull_request) Has been cancelled
Details
Test / rust-tests (pull_request) Has been cancelled
Details
Test / frontend-typecheck (pull_request) Has been cancelled
Details
10b931809b 
tauri-plugin-stronghold pulls in libsodium-sys-stable which panics at
build time if libsodium is not found via pkg-config — it does not compile
from source. All builder images and the test job inline apt installs were
missing libsodium-dev, breaking every Rust compilation step.

- Add libsodium-dev to Dockerfile.linux-amd64
- Add libsodium-dev (host) + libsodium-dev:arm64 (cross target) to
  Dockerfile.linux-arm64
- Add libsodium-dev to all three Rust jobs in test.yml
- Add inline apt-get install to linux-amd64 and linux-arm64 Build steps
  in auto-tag.yml and release-beta.yml (bridges the timing race between
  build-images and auto-tag triggering on the same push)
- Add SODIUM_LIB_DIR + SODIUM_STATIC to Windows Build env (Dockerfile
  already pre-builds libsodium; this tells the crate where to find it)
Merge branch 'master' into fix/updater-issues
Some checks failed
PR Review Automation / review (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-tests (pull_request) Has been cancelled
Details
Test / rust-clippy (pull_request) Has been cancelled
Details
Test / rust-fmt-check (pull_request) Has been cancelled
Details
6ac4123cd4
Merge pull request 'fix(ci): add libsodium to all build environments' (#106) from fix/updater-issues into master
Some checks failed
Auto Tag / autotag (push) Successful in 9s
Details
Auto Tag / wiki-sync (push) Successful in 11s
Details
Build CI Docker Images / windows-cross (push) Successful in 14s
Details
Sync Beta from Master / sync (push) Failing after 58s
Details
Test / frontend-typecheck (push) Successful in 2m0s
Details
Test / frontend-tests (push) Successful in 1m39s
Details
Auto Tag / changelog (push) Successful in 1m47s
Details
Auto Tag / build-windows-amd64 (push) Has been cancelled
Details
Auto Tag / build-linux-arm64 (push) Has been cancelled
Details
Auto Tag / build-macos-arm64 (push) Has been cancelled
Details
Auto Tag / build-linux-amd64 (push) Has been cancelled
Details
Build CI Docker Images / linux-arm64 (push) Has been cancelled
Details
Build CI Docker Images / linux-amd64 (push) Has been cancelled
Details
Test / rust-fmt-check (push) Has been cancelled
Details
Test / rust-clippy (push) Has been cancelled
Details
Test / rust-tests (push) Has been cancelled
Details
450ef84da7 
Reviewed-on: #106
chore: merge master into beta — resolve libsodium workflow conflicts
Some checks failed
PR Review Automation / review (pull_request) Has been cancelled
Details
Test / frontend-typecheck (pull_request) Has been cancelled
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
Test / frontend-tests (pull_request) Has been cancelled
Details
a62a59c5dc 
Resolves conflicts in auto-tag.yml and release-beta.yml caused by two
independent libsodium fixes landing on separate branches (PR #105 on beta
via SODIUM_LIB_DIR, PR #106 on master via apt-get install).

Resolution keeps beta's approach throughout: SODIUM_LIB_DIR env vars
pointing at pre-installed system libraries, with no runtime apt-get install.
Also carries forward master's Dockerfile.linux-arm64 libsodium addition and
CHANGELOG.md update.
sarman merged commit a0eea43a0e into beta 2026-06-18 00:21:23 +00:00
sarman deleted branch fix/sync-master-to-beta 2026-06-18 00:21:23 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No Label
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: sarman/tftsr-devops_investigation#108
No description provided.
Delete Branch "fix/sync-master-to-beta"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?