build: fix landed message for multiple commits in commit-queue - #35226
Closed
lundibundi wants to merge 2 commits into
Closed
build: fix landed message for multiple commits in commit-queue#35226lundibundi wants to merge 2 commits into
lundibundi wants to merge 2 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
targos
reviewed
Sep 16, 2020
Comment thread
tools/actions/commit-queue.sh
Outdated
Copy link
Copy Markdown
Member
|
What about getting the first commit before we push with git rev-parse upstream/master ? |
Sorry, something went wrong.
mmarchini
approved these changes
Sep 16, 2020
targos
approved these changes
Sep 16, 2020
Trott
approved these changes
Sep 18, 2020
Copy link
Copy Markdown
Member
|
Any reason not to land this? |
Sorry, something went wrong.
Copy link
Copy Markdown
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) |
Sorry, something went wrong.
aduh95
approved these changes
Oct 7, 2020
aduh95
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
LGTM
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
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 |
Sorry, something went wrong.
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>
This comment has been minimized.
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
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>
Copy link
Copy Markdown
Contributor
|
Tested on #35454, seems to work just fine 🎉 |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
@lundibundi However, it seems to have "broken" when there's only one commit: #35527 (comment) |
Sorry, something went wrong.
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>
This was referenced Sep 29, 2022
This was referenced Oct 5, 2022
This was referenced Oct 8, 2022
This was referenced Oct 26, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist
Anyone knows of a better way than git merge-base?
Refs: #34770 (comment)
/cc @mmarchini @targos