-
Notifications
You must be signed in to change notification settings - Fork 30.2k
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
doc: make explicit reverting node_version.h changes #36461
Conversation
Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch.
Is there GitHub check/action that can be created to read I follow the releases guide step by step though, so this would be helpful for me 👍🏼 |
I'm not aware if there's anything we can do to via actions to prevent merging as we're talking here about releasers cherry-picking the release commit onto the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I know that @codebytere was working on the "land" portion of |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Does it also work for releases that do not change the version number (and therefore do not generate conflicts)? It's usual with semver-patch LTS releases. |
I've pushed a small fixup for the case where there are no conflicts in |
Yeah changes executed in this version.
…On Fri, Dec 11, 2020, 11:50 AM Michaël Zasso ***@***.***> wrote:
***@***.**** approved this pull request.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#36461 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AJNNPKICU4U2YNCJOI2QAJDSUG2ZRANCNFSM4UT2V5JA>
.
|
Landed in a150926...0b3caad |
Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch. PR-URL: #36461 Refs: #36460 Refs: #36385 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Danielle Adams <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Shelley Vohr <[email protected]> Reviewed-By: Rich Trott <[email protected]>
Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch. PR-URL: #36461 Refs: #36460 Refs: #36385 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Danielle Adams <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Shelley Vohr <[email protected]> Reviewed-By: Rich Trott <[email protected]>
Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch. PR-URL: #36461 Refs: #36460 Refs: #36385 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Danielle Adams <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Shelley Vohr <[email protected]> Reviewed-By: Rich Trott <[email protected]>
Add an explicit command to revert changes to
node_version.h
whencherry-picking the release commit to the
master
branch.cc @nodejs/releasers
Refs: #36460
Refs: #36385
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passes