sarman/tftsr-devops_investigation
1
1
Fork 0
Code Issues 4 Pull Requests Actions 36 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
sarman commented 2026-06-18 00:12:55 +00:00
Owner
Copy Link

Summary

  • PR #105 (beta) and PR #106 (master) independently fixed libsodium using different methods, causing conflicts on every auto master→beta sync
  • Adopt beta's proven SODIUM_LIB_DIR / SODIUM_USE_PKG_CONFIG approach across auto-tag.yml and release-beta.yml
  • Removes runtime apt-get install libsodium-dev (added in #106) — not needed when Docker images already ship libsodium

Test plan

  • CI on this PR passes (test workflow)
  • After merge to master, auto-sync job merges cleanly into beta without conflict
  • Beta release pipeline builds successfully (libsodium resolves via SODIUM_LIB_DIR)

Files changed

  • .gitea/workflows/auto-tag.yml — linux-amd64: SODIUM_LIB_DIR, remove apt-get; arm64: SODIUM_LIB_DIR + extended PKG_CONFIG_PATH, remove apt-get; windows: remove SODIUM_STATIC
  • .gitea/workflows/release-beta.yml — linux-amd64 + arm64: remove apt-get; arm64: extended PKG_CONFIG_PATH; windows: add SODIUM_USE_PKG_CONFIG=no
## Summary - PR #105 (beta) and PR #106 (master) independently fixed libsodium using different methods, causing conflicts on every auto master→beta sync - Adopt beta's proven `SODIUM_LIB_DIR` / `SODIUM_USE_PKG_CONFIG` approach across `auto-tag.yml` and `release-beta.yml` - Removes runtime `apt-get install libsodium-dev` (added in #106) — not needed when Docker images already ship libsodium ## Test plan - [ ] CI on this PR passes (test workflow) - [ ] After merge to master, auto-sync job merges cleanly into beta without conflict - [ ] Beta release pipeline builds successfully (libsodium resolves via `SODIUM_LIB_DIR`) ## Files changed - `.gitea/workflows/auto-tag.yml` — linux-amd64: `SODIUM_LIB_DIR`, remove apt-get; arm64: `SODIUM_LIB_DIR` + extended `PKG_CONFIG_PATH`, remove apt-get; windows: remove `SODIUM_STATIC` - `.gitea/workflows/release-beta.yml` — linux-amd64 + arm64: remove apt-get; arm64: extended `PKG_CONFIG_PATH`; windows: add `SODIUM_USE_PKG_CONFIG=no`
sarman added 1 commit 2026-06-18 00:12:56 +00:00
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
69dae719f9 
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
sarman changed target branch from master to beta 2026-06-18 00:13:26 +00:00
sarman changed target branch from beta to master 2026-06-18 00:15:39 +00:00
sarman closed this pull request 2026-06-18 00:16:49 +00:00
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

Pull request closed

Please reopen this pull request to perform a merge.
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#107
No description provided.
Delete Branch "fix/resolve-libsodium-merge-conflict"

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?