Skip to content

tools: use different branch for tool updates on staging branches#63110

Merged
nodejs-github-bot merged 1 commit into
nodejs:mainfrom
aduh95:tool-update-no-conflict
May 11, 2026
Merged

tools: use different branch for tool updates on staging branches#63110
nodejs-github-bot merged 1 commit into
nodejs:mainfrom
aduh95:tool-update-no-conflict

Conversation

@aduh95
Copy link
Copy Markdown
Contributor

@aduh95 aduh95 commented May 4, 2026

To allow having concurrent update PRs for the same tool on different branches (e.g. Undici@6 version bump for v22.x-staging in #63109 was overwriting the Undici@8 for main in #63092).

The solution I went with is to add the base branch name in the PR branch name for non-main updates.

@aduh95 aduh95 added the lts-watch-v22.x PRs that may need to be released in v22.x label May 4, 2026
@nodejs-github-bot
Copy link
Copy Markdown
Collaborator

Review requested:

  • @nodejs/actions
  • @nodejs/security-wg

@nodejs-github-bot nodejs-github-bot added the meta Issues and PRs related to the general management of the project. label May 4, 2026
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
@aduh95 aduh95 force-pushed the tool-update-no-conflict branch from c959895 to 811d178 Compare May 4, 2026 08:31
@aduh95 aduh95 added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. commit-queue Add this label to land a pull request using GitHub Actions. labels May 4, 2026
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels May 11, 2026
@nodejs-github-bot
Copy link
Copy Markdown
Collaborator

Commit Queue failed
- Loading data for nodejs/node/pull/63110
✔  Done loading data for nodejs/node/pull/63110
----------------------------------- PR info ------------------------------------
Title      tools: use different branch for tool updates on staging branches (#63110)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     aduh95:tool-update-no-conflict -> nodejs:main
Labels     meta, author ready, lts-watch-v22.x
Commits    1
 - tools: use different branch for tool updates on staging branches
Committers 1
 - Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/63110
Reviewed-By: James M Snell <jasnell@gmail.com>
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/63110
Reviewed-By: James M Snell <jasnell@gmail.com>
--------------------------------------------------------------------------------
   ℹ  This PR was created on Mon, 04 May 2026 08:26:25 GMT
   ✔  Approvals: 1
   ✔  - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/63110#pullrequestreview-4221272415
   ✔  Last GitHub CI successful
   ℹ  Green GitHub CI is sufficient
--------------------------------------------------------------------------------
   ✔  No git cherry-pick in progress
   ✔  No git am in progress
   ✔  No git rebase in progress
--------------------------------------------------------------------------------
- Bringing origin/main up to date...
From https://github.com/nodejs/node
 * branch                  main       -> FETCH_HEAD
✔  origin/main is now up-to-date
- Downloading patch for 63110
remote: Internal Server Error
fatal: unable to access 'https://github.com/nodejs/node/': The requested URL returned error: 500
https://github.com/nodejs/node/actions/runs/25675882689

@aduh95 aduh95 added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels May 11, 2026
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label May 11, 2026
@nodejs-github-bot nodejs-github-bot merged commit a349018 into nodejs:main May 11, 2026
29 checks passed
@nodejs-github-bot
Copy link
Copy Markdown
Collaborator

Landed in a349018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author ready PRs that have at least one approval, no pending requests for changes, and a CI started. lts-watch-v22.x PRs that may need to be released in v22.x meta Issues and PRs related to the general management of the project.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants