Fix rebuild Action - #3568
Merged
henrymercer merged 4 commits intoMar 11, 2026
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the “Rebuild Action” workflow to run with a Node.js version compatible with the workflow generator, and fixes the workflow’s handling of merge conflicts when rebuilding generated artifacts.
Changes:
- Add Node.js setup (Node 24) to the rebuild workflow.
- Fix merge-conflict detection by correctly capturing the git merge exit code.
- Conclude an in-progress merge by committing (instead of git merge --continue) after rebuild resolves conflicts.
Sorry, something went wrong.
esbena
approved these changes
Mar 11, 2026
esbena
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
LGTM.
And thanks for the additional "Also fix running ...", at first I only expected the node24 bump and expected the full diff would be sufficient to review in isolation.
Sorry, something went wrong.
This was referenced Mar 16, 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
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.
This broke when the workflow generator has started requiring Node.js >=22.
Also fix running the rebuild Action to resolve merge conflicts: