fix(ci): re-merge 1.96.5#33
Merged
Merged
Conversation
Release 1.96.5
Re-merge to recover upstream v1.96.5 content for the nine files whose conflict resolution in #32 kept the coreweave side, silently dropping upstream work. Most notably VERSION.txt stayed at 1.94.1, causing the image/chart publish workflows to keep emitting v1.94.1-<sha> tags. Upstream commit attribution is preserved: the merge brings v1.96.5's ancestry in as a parent, so git blame on the nine files walks back to the original upstream authors rather than a squashed fix commit.
anthr76
approved these changes
Apr 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#32 bumped this repo to 1.96.5, but was an incomplete merge.
This PR correctly merges in the upstream tag.