Fix rebuild Action by henrymercer · Pull Request #3568

Fix rebuild Action by henrymercer · Pull Request #3568 · github/codeql-action

This broke when the workflow generator has started requiring Node.js >=22.

Also fix running the rebuild Action to resolve merge conflicts:

6fb1c2a fixes the detection of merge conflicts
5f3f250 fixes concluding the merge when there were merge conflicts

Copilot AI review requested due to automatic review settings

March 11, 2026 18:27

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

This was referenced

Mar 16, 2026