tools: use github cli to squash the pr by bjohansebas · Pull Request #57675 · nodejs/node

bjohansebas · 2025-03-29T15:20:21Z

Now GitHub CLI allow editing the commit message when squash-merging a PR

nodejs-github-bot · 2025-03-29T15:20:26Z

Review requested:

@nodejs/actions

aduh95

That doesn't let us specify which is the commit head

lpinca · 2025-03-31T20:02:30Z

@bjohansebas I think that the --match-head-commit option addresses Antoine's comment.

--match-head-commit <SHA>
 Commit SHA that the pull request head must match to allow merge

bjohansebas · 2025-04-01T18:06:46Z

Thanks @lpinca, I didn't really know the block very well.

aduh95

Can you delete the rm output.json line? I don’t think we’re using it anymore

bjohansebas · 2025-04-01T20:37:20Z

Do you know if GH_PROMPT_DISABLED is defined as an environment variable? I'm learning about how Node's CI works, and I don't know if this environment variable is set by default.

aduh95 · 2025-04-01T21:43:32Z

Do you know if GH_PROMPT_DISABLED is defined as an environment variable? I'm learning about how Node's CI works, and I don't know if this environment variable is set by default.

Why do you ask? It doesn't seem that variable is listed on gh pr merge docs: https://cli.github.com/manual/gh_pr_merge

bjohansebas · 2025-04-01T22:03:57Z

Because there may be occasions when the GitHub CLI displays prompts, adding GH_PROMPT_DISABLED can disable them to prevent prompts from appearing.
https://cli.github.com/manual/gh_help_environment

I don't know if it makes sense to add it.

aduh95 · 2025-04-01T22:35:04Z

I've tried to land a PR with gh pr merge:

$ gh pr merge 57654 --squash --body 'PR-URL: https://github.com/nodejs/node/pull/57654
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jake Yuesong Li <jake.yuesong@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>' --subject 'doc: clarify `unhandledRejection` events behaviors in process doc' --match-head-commit c9c90f70097af0c445a92045f47a3ba3deb1cd16
X Pull request nodejs/node#57654 is not mergeable: the base branch policy prohibits the merge.
To have the pull request merged after all the requirements have been met, add the `--auto` flag.
To use administrator privileges to immediately merge the pull request, add the `--admin` flag.
$ gh pr merge 57654 --squash --body 'PR-URL: https://github.com/nodejs/node/pull/57654
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jake Yuesong Li <jake.yuesong@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>' --subject 'doc: clarify `unhandledRejection` events behaviors in process doc' --match-head-commit c9c90f70097af0c445a92045f47a3ba3deb1cd16 --auto
GraphQL: Pull request Auto merge is not allowed for this repository (enablePullRequestAutoMerge)

It looks like CLI is wrong here, the PR is definitely mergeable, not sure where it's getting that information from

bjohansebas · 2025-04-01T22:52:43Z

Hmm, I've tried the command several times against other repositories. Do you have GitHub CLI updated?

aduh95 · 2025-04-02T10:10:30Z

$  gh --version
gh version 2.69.0 (1980-01-01)
https://github.com/cli/cli/releases/tag/v2.69.0

It's the latest version, despite being allegedly 45 years old 😅 I've asked @JakobJingleheimer to run the command for me, and it worked (he's using gh version 2.66.1 (2025-01-31))

bnb · 2025-04-02T12:13:02Z

It looks like CLI is wrong here, the PR is definitely mergeable, not sure where it's getting that information from

the output specifically cites the base branch policy prohibits the merge. I'm guessing the token you're using to test this isn't correctly privileged?

bjohansebas · 2025-04-03T20:06:51Z

How could this be unlocked, given that these commands perform similar tasks in principle and there shouldn't be any permission issues, since the token will be the same with my change or with the previous method

aduh95 · 2025-04-03T20:15:38Z

We should try to set it up on nodejs/node-auto-test and see how it performs. I'll try to do that over the weekend

PR-URL: nodejs/node#57675 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

aduh95 · 2025-04-05T14:20:55Z

I tested with https://github.com/nodejs/node-auto-test/actions/runs/14282489948/job/40033645347, the CI sees the same error as I was seeing (the base branch policy prohibits the merge). I tried adding --admin flag, it seemed to fix the issue

aduh95

Can you please also update tools/actions/merge.sh?

bjohansebas · 2025-04-06T17:30:15Z

it now includes the --admin flag, it's curious that this flag is needed.

aduh95 · 2025-04-06T21:09:32Z

Can you remove the mention of jq as a required deps in

node/tools/actions/merge.sh

Line 3 in e8633dd

    
           # Requires [gh](https://cli.github.com/), [jq](https://jqlang.github.io), git, and grep. Also awk if you pass a URL.

bjohansebas · 2025-04-06T21:34:48Z

It is needed on this line

node/tools/actions/merge.sh

Line 49 in e8633dd

    
           if ! commits="$(jq -r 'if .merged then .sha else error("not merged") end' < output)"; then

aduh95 · 2025-04-07T21:43:59Z

-      '{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json
-    cat output.json
-    if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then
+    if ! gh pr merge "$pr" --squash --body "$commit_body" --subject "$commit_title" --match-head-commit "$commit_head" --admin > output; then


As I was saying in https://github.com/nodejs/node/pull/57675/files#r2032046457, this command does not output anything so we can probably not use it for now :/

bjohansebas · 2025-04-26T02:07:00Z

I think the best thing would be to remove the TODO and explain why github cli can't be used

github-actions · 2026-04-20T01:44:52Z

This pull request has been marked as stale due to 210 days of inactivity.
It will be automatically closed in 30 days if no further activity occurs. If this is still relevant, please leave a comment or update it to keep it open.

nodejs-github-bot added the tools Issues and PRs related to the tools directory. label Mar 29, 2025

lpinca approved these changes Mar 29, 2025

View reviewed changes

bjohansebas added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 29, 2025

aduh95 requested changes Mar 31, 2025

View reviewed changes

aduh95 removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 31, 2025

bjohansebas force-pushed the gh-title branch from 62a1e77 to abef69c Compare April 1, 2025 18:05

bjohansebas requested review from aduh95 and lpinca April 1, 2025 18:06

aduh95 reviewed Apr 1, 2025

View reviewed changes

bjohansebas force-pushed the gh-title branch from abef69c to 59528e6 Compare April 1, 2025 20:31

bjohansebas requested a review from aduh95 April 1, 2025 20:31

aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Apr 5, 2025

tools: update repo name for CQ

18d5276

PR-URL: nodejs/node#57675 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Apr 5, 2025

tools: update repo name for CQ

6d4dc49

PR-URL: nodejs/node#57675 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Apr 5, 2025

tools: update repo name for CQ

2e1eb1a

PR-URL: nodejs/node#57675 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Apr 5, 2025

tools: update repo name for CQ

1eb02b4

PR-URL: nodejs/node#57675 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Apr 5, 2025

tools: update repo name for CQ

165ee0c

PR-URL: nodejs/node#57675 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Apr 5, 2025

tools: update repo name for CQ

a3c9847

PR-URL: nodejs/node#57675 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

bjohansebas force-pushed the gh-title branch from 59528e6 to 9af5793 Compare April 6, 2025 17:28

aduh95 approved these changes Apr 6, 2025

View reviewed changes

bjohansebas force-pushed the gh-title branch from 9af5793 to e8633dd Compare April 6, 2025 17:34

tools: use github cli to squash the pr

e8633dd

bjohansebas requested a review from aduh95 April 6, 2025 17:36

aduh95 reviewed Apr 6, 2025

View reviewed changes

Comment thread tools/actions/merge.sh

aduh95 reviewed Apr 7, 2025

View reviewed changes

github-actions Bot added the stale label Apr 20, 2026

bjohansebas closed this Apr 20, 2026

Uh oh!

Conversation

bjohansebas commented Mar 29, 2025

Uh oh!

nodejs-github-bot commented Mar 29, 2025

Uh oh!

aduh95 left a comment

Choose a reason for hiding this comment

Uh oh!

lpinca commented Mar 31, 2025

Uh oh!

bjohansebas commented Apr 1, 2025

Uh oh!

aduh95 left a comment

Choose a reason for hiding this comment

Uh oh!

bjohansebas commented Apr 1, 2025

Uh oh!

aduh95 commented Apr 1, 2025

Uh oh!

bjohansebas commented Apr 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aduh95 commented Apr 1, 2025

Uh oh!

bjohansebas commented Apr 1, 2025

Uh oh!

aduh95 commented Apr 2, 2025

Uh oh!

bnb commented Apr 2, 2025

Uh oh!

bjohansebas commented Apr 3, 2025

Uh oh!

aduh95 commented Apr 3, 2025

Uh oh!

aduh95 commented Apr 5, 2025

Uh oh!

aduh95 left a comment

Choose a reason for hiding this comment

Uh oh!

bjohansebas commented Apr 6, 2025

Uh oh!

aduh95 commented Apr 6, 2025

Uh oh!

bjohansebas commented Apr 6, 2025

Uh oh!

Uh oh!

aduh95 Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

bjohansebas commented Apr 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Apr 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bjohansebas commented Apr 1, 2025 •

edited

Loading

bjohansebas commented Apr 26, 2025 •

edited

Loading