Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tools: simplify and fix commit queue #40742

Merged
merged 4 commits into from
Nov 7, 2021
Merged

tools: simplify and fix commit queue #40742

merged 4 commits into from
Nov 7, 2021

Conversation

targos
Copy link
Member

@targos targos commented Nov 6, 2021

/cc @nodejs/actions

@nodejs-github-bot nodejs-github-bot added meta Issues and PRs related to the general management of the project. tools Issues and PRs related to the tools directory. labels Nov 6, 2021
aduh95
aduh95 approved these changes Nov 6, 2021
View reviewed changes
.github/workflows/commit-queue.yml Outdated Show resolved Hide resolved
@targos @aduh95
Update .github/workflows/commit-queue.yml
bf2bbe1 
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
@aduh95 aduh95 added the fast-track PRs that do not need to wait for 48 hours to land. label Nov 6, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Nov 6, 2021

Fast-track has been requested by @aduh95. Please 👍 to approve.

aduh95
aduh95 reviewed Nov 6, 2021
View reviewed changes
Copy link
Contributor

@aduh95 aduh95 left a comment

Choose a reason for hiding this comment

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

To fix the CQ failing to push, we need to use the nodejs-github-bot token when merging, as the gituhb-actions bot user is not allowed to push to this repo (see conversation in #40734).

.github/workflows/commit-queue.yml Show resolved Hide resolved
tools/actions/commit-queue.sh Show resolved Hide resolved
tools/actions/commit-queue.sh Outdated Show resolved Hide resolved
targos and others added 2 commits November 6, 2021 18:11
@targos @aduh95
Update tools/actions/commit-queue.sh
aaca6bf 
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
@targos
Update .github/workflows/commit-queue.yml
4de4293
@targos targos changed the title tools: use gh CLI for CI and commit queue jobs tools: simplify and fix commit queue Nov 7, 2021
@aduh95 aduh95 merged commit 8731193 into nodejs:master Nov 7, 2021
@aduh95
Copy link
Contributor

aduh95 commented Nov 7, 2021

Landed in 8731193

@aduh95
Copy link
Contributor

aduh95 commented Nov 7, 2021 

GraphQL error: Your token has not been granted the required scopes to execute this query. The 'login' field requires one of the following scopes: ['read:org'], but your token has only been granted the: ['read:user', 'repo', 'user:email', 'workflow'] scopes. Please modify your token's scopes at: https://github.com/settings/tokens.

https://github.com/nodejs/node/runs/4131235476?check_suite_focus=true

@aduh95
Copy link
Contributor

aduh95 commented Nov 7, 2021

It looks like we need to either go back to using both tokens, or update the permissions of the bot's token. I'll open an issue on nodejs/admin to request the latter, but on the mean time the CQ is broken.

@aduh95 aduh95 mentioned this pull request Nov 7, 2021
Closed
targos added a commit that referenced this pull request Nov 8, 2021
@targos
tools: simplify and fix commit queue
bbc10f1 
Use `gh` CLI for CI and commit queue jobs, and use the correct token
to merge PRs.

PR-URL: #40742
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Voltrex <mohammadkeyvanzade94@gmail.com>
@targos targos mentioned this pull request Nov 8, 2021
Merged
@mmarchini
Copy link
Contributor

I temporarily disabled the CQ action until we fix the issue.

@targos targos deleted the gh-no-curl branch November 8, 2021 20:36
BethGriggs pushed a commit that referenced this pull request Nov 25, 2021
@targos @BethGriggs
tools: simplify and fix commit queue
64c6575 
Use `gh` CLI for CI and commit queue jobs, and use the correct token
to merge PRs.

PR-URL: #40742
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Voltrex <mohammadkeyvanzade94@gmail.com>
@BethGriggs BethGriggs mentioned this pull request Nov 26, 2021
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aduh95 aduh95 aduh95 approved these changes

@VoltrexKeyva VoltrexKeyva VoltrexKeyva approved these changes

Assignees
No one assigned
Labels
fast-track PRs that do not need to wait for 48 hours to land. meta Issues and PRs related to the general management of the project. tools Issues and PRs related to the tools directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@targos @aduh95 @mmarchini @VoltrexKeyva @nodejs-github-bot