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.

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

build: fix landed message for multiple commits in commit-queue #35226

Closed
wants to merge 2 commits into from

Conversation

lundibundi
Copy link
Member

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

Anyone knows of a better way than git merge-base?

Refs: #34770 (comment)

/cc @mmarchini @targos

@nodejs-github-bot nodejs-github-bot added the tools Issues and PRs related to the tools directory. label Sep 16, 2020
@targos
Copy link
Member

targos commented Sep 16, 2020

What about getting the first commit before we push with git rev-parse upstream/master ?

@Trott
Copy link
Member

Trott commented Sep 24, 2020

Any reason not to land this?

@lundibundi
Copy link
Member Author

@Trott The only one is that I didn't test this explicitly on i.e. node-auto-test as I didn't yet have to to do so, but this should 'just work' 😄 so we can probably land it and fix issues later, it shouldn't cause any major issues if it fails (same goes for #35206)

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.

LGTM

@aduh95 aduh95 added the commit-queue Add this label to land a pull request using GitHub Actions. label Oct 7, 2020
@github-actions github-actions bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Oct 7, 2020
@github-actions
Copy link
Contributor

github-actions bot commented Oct 7, 2020

Commit Queue failed
- Loading data for nodejs/node/pull/35226
✔  Done loading data for nodejs/node/pull/35226
----------------------------------- PR info ------------------------------------
Title      build: fix landed message for multiple commits in commit-queue (#35226)
Author     Denys Otrishko  (@lundibundi)
Branch     lundibundi:fix-cq-multiple-commits -> nodejs:master
Labels     tools
Commits    2
 - build: fix landed message for multiple commits in commit-queue
 - fixup! build: fix landed message for multiple commits in commit-queue
Committers 1
 - Denys Otrishko 
PR-URL: https://github.com/nodejs/node/pull/35226
Reviewed-By: Mary Marchini 
Reviewed-By: Michaël Zasso 
Reviewed-By: Rich Trott 
Reviewed-By: Antoine du Hamel 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/35226
Reviewed-By: Mary Marchini 
Reviewed-By: Michaël Zasso 
Reviewed-By: Rich Trott 
Reviewed-By: Antoine du Hamel 
--------------------------------------------------------------------------------
   ✖  Last GitHub CI failed
   ✖  No Jenkins CI runs detected
   ℹ  This PR was created on Wed, 16 Sep 2020 07:54:29 GMT
   ✔  Approvals: 4
   ✔  - Mary Marchini (@mmarchini) (TSC): https://github.com/nodejs/node/pull/35226#pullrequestreview-489789906
   ✔  - Michaël Zasso (@targos) (TSC): https://github.com/nodejs/node/pull/35226#pullrequestreview-489791775
   ✔  - Rich Trott (@Trott) (TSC): https://github.com/nodejs/node/pull/35226#pullrequestreview-491323947
   ✔  - Antoine du Hamel (@aduh95): https://github.com/nodejs/node/pull/35226#pullrequestreview-504200504
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu

@github-actions github-actions bot added the commit-queue-failed An error occurred while landing this pull request using GitHub Actions. label Oct 7, 2020
aduh95 pushed a commit to nodejs/node-auto-test that referenced this pull request Oct 9, 2020
PR-URL: nodejs/node#35226
Reviewed-By: Mary Marchini <oss@mmarchini.me>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
@aduh95 aduh95 added request-ci Add this label to start a Jenkins CI on a PR. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Oct 9, 2020
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 9, 2020
@nodejs-github-bot

This comment has been minimized.

@nodejs-github-bot
Copy link
Collaborator

@aduh95 aduh95 added the commit-queue Add this label to land a pull request using GitHub Actions. label Oct 9, 2020
@github-actions github-actions bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Oct 9, 2020
@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2020

Landed in ce11b1c

@github-actions github-actions bot closed this Oct 9, 2020
nodejs-github-bot pushed a commit that referenced this pull request Oct 9, 2020
PR-URL: #35226
Reviewed-By: Mary Marchini <oss@mmarchini.me>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
@aduh95
Copy link
Contributor

aduh95 commented Oct 9, 2020

Tested on #35454, seems to work just fine 🎉

@lundibundi lundibundi deleted the fix-cq-multiple-commits branch October 9, 2020 21:07
@aduh95
Copy link
Contributor

aduh95 commented Oct 11, 2020

@lundibundi However, it seems to have "broken" when there's only one commit: #35527 (comment)

BethGriggs pushed a commit that referenced this pull request Oct 14, 2020
PR-URL: #35226
Reviewed-By: Mary Marchini <oss@mmarchini.me>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants