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

chore: merge master into beta — resolve SODIUM_USE_PKG_CONFIG conflict in auto-tag.yml #112

Merged
sarman merged 5 commits from fix/sync-master-sodium-unset into beta 2026-06-18 01:21:52 +00:00
Conversation 0 Commits 5 Files Changed 2 +10
sarman commented 2026-06-18 01:20:52 +00:00
Owner
Copy Link

What

Manual resolution of the merge conflict produced by the auto-sync after PR #111 merged to master.

Conflict

Master added unset SODIUM_USE_PKG_CONFIG to the linux-amd64 and linux-arm64 build steps in auto-tag.yml. Beta already had auto-tag.yml diverged from that same ancestor region (via the earlier libsodium sync work), so git could not auto-merge.

Resolution

Took master's version in both conflict regions — the unset lines are the correct fix. All three platform build steps in auto-tag.yml now have consistent SODIUM_LIB_DIR + unset SODIUM_USE_PKG_CONFIG.

## What Manual resolution of the merge conflict produced by the auto-sync after PR #111 merged to master. ## Conflict Master added `unset SODIUM_USE_PKG_CONFIG` to the linux-amd64 and linux-arm64 build steps in `auto-tag.yml`. Beta already had `auto-tag.yml` diverged from that same ancestor region (via the earlier libsodium sync work), so git could not auto-merge. ## Resolution Took master's version in both conflict regions — the `unset` lines are the correct fix. All three platform build steps in `auto-tag.yml` now have consistent `SODIUM_LIB_DIR` + `unset SODIUM_USE_PKG_CONFIG`.
sarman added 5 commits 2026-06-18 01:20:53 +00:00
fix(ci): unset SODIUM_USE_PKG_CONFIG and use SODIUM_LIB_DIR in auto-tag.yml
Some checks failed
PR Review Automation / review (pull_request) Has been cancelled
Details
Test / rust-tests (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-clippy (pull_request) Has been cancelled
Details
Test / rust-fmt-check (pull_request) Has been cancelled
Details
a15e69413a 
The libsodium-sys-stable build.rs panics when both SODIUM_LIB_DIR and
SODIUM_USE_PKG_CONFIG are set simultaneously. The runner environment at
172.0.0.29 has SODIUM_USE_PKG_CONFIG set (not traceable to any workflow
file or Docker image ENV layer), which conflicts with any step that sets
SODIUM_LIB_DIR.

For all three platform builds (linux-amd64, windows-amd64, linux-arm64):
- Add `unset SODIUM_USE_PKG_CONFIG` to the shell before cargo runs
- Switch Linux builds from inline apt-get to SODIUM_LIB_DIR (Docker
  images already include libsodium-dev, removing the redundant install)
- Extend arm64 PKG_CONFIG_PATH to include /usr/aarch64-linux-gnu/lib/pkgconfig
  (matching the beta workflow for consistency)

The unset is a no-op when the variable is absent; it cleanly clears any
ambient value injected by the runner infrastructure.
Merge pull request 'fix(ci): unset SODIUM_USE_PKG_CONFIG and use SODIUM_LIB_DIR in auto-tag.yml' (#111) from fix/unset-sodium-pkg-config-master into master
Some checks failed
Auto Tag / autotag (push) Successful in 16s
Details
Auto Tag / wiki-sync (push) Successful in 15s
Details
Sync Beta from Master / sync (push) Failing after 1m9s
Details
Test / frontend-tests (push) Successful in 1m40s
Details
Test / frontend-typecheck (push) Successful in 1m55s
Details
Auto Tag / changelog (push) Successful in 1m59s
Details
Auto Tag / build-macos-arm64 (push) Successful in 5m37s
Details
Auto Tag / build-linux-amd64 (push) Failing after 4m38s
Details
Test / rust-clippy (push) Has been cancelled
Details
Test / rust-fmt-check (push) Has been cancelled
Details
Test / rust-tests (push) Has been cancelled
Details
Auto Tag / build-linux-arm64 (push) Has been cancelled
Details
Auto Tag / build-windows-amd64 (push) Has been cancelled
Details
df833e8464 
Reviewed-on: #111
chore: merge master into beta — resolve SODIUM_USE_PKG_CONFIG conflict in auto-tag.yml
Some checks failed
PR Review Automation / review (pull_request) Has been cancelled
Details
Test / rust-clippy (pull_request) Has been cancelled
Details
Test / rust-tests (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-fmt-check (pull_request) Has been cancelled
Details
ec20f343c4 
Master added `unset SODIUM_USE_PKG_CONFIG` to the linux-amd64 and
linux-arm64 build steps in auto-tag.yml (PR #111). Beta's copy of
auto-tag.yml was already ahead of master via the previous sync but
lacked those two unset lines, causing a line-level conflict.

Resolution: take master's version in both conflict regions, adding the
unset to both linux build steps. All three platforms (amd64, Windows,
arm64) now have consistent SODIUM_LIB_DIR + unset configuration.
sarman merged commit 721192edb0 into beta 2026-06-18 01:21:52 +00:00
sarman deleted branch fix/sync-master-sodium-unset 2026-06-18 01:21:53 +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#112
No description provided.
Delete Branch "fix/sync-master-sodium-unset"

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?