GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Fix rebuild Action by henrymercer · Pull Request #3568 · github/codeql-action

Conversation

@henrymercer

@henrymercer henrymercer commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

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

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
henrymercer added 3 commits March 11, 2026 18:18
@henrymercer
CI: Set up Node.js 24 in rebuild workflow
4472004
@henrymercer
Fix merge in progress detection
6fb1c2a
@henrymercer
Fix finishing up in progress merge
5f3f250
@henrymercer
henrymercer requested a review from a team as a code owner March 11, 2026 18:27
Copilot AI review requested due to automatic review settings March 11, 2026 18:27
@github-actions github-actions Bot added the size/XS Should be very easy to review label Mar 11, 2026
Copilot started reviewing on behalf of henrymercer March 11, 2026 18:27
View session
Copilot AI reviewed Mar 11, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

There was a problem hiding this comment.

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.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
Comment thread .github/workflows/rebuild.yml Resolved

Uh oh!

There was an error while loading. Please reload this page.
Comment thread .github/workflows/rebuild.yml Resolved

Uh oh!

There was an error while loading. Please reload this page.
@henrymercer
Address review comments
567ca73
esbena
esbena approved these changes Mar 11, 2026
View reviewed changes

@esbena esbena left a comment

Copy link
Copy Markdown
Contributor

There was a problem hiding this comment.

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.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@henrymercer
henrymercer added this pull request to the merge queue Mar 11, 2026
Merged via the queue into main with commit 378e4b3 Mar 11, 2026
246 checks passed

Uh oh!

There was an error while loading. Please reload this page.
@henrymercer
henrymercer deleted the henrymercer/fix-rebuild branch March 11, 2026 19:33
This was referenced Mar 16, 2026
Merge main into releases/v4 #3574
Merged
Merge releases/v4 into releases/v3 #3577
Merged
@henrymercer henrymercer mentioned this pull request Oct 2, 2026
Fix merge conflict handling in the rebuild workflow #4191
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mbg mbg mbg left review comments
Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@esbena esbena esbena approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

size/XS Should be very easy to review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@henrymercer @mbg @esbena
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.