FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

doc: make explicit reverting node_version.h changes by richardlau · Pull Request #36461 · nodejs/node · GitHub

/ node Public

doc: make explicit reverting node_version.h changes - #36461

Closed
richardlau wants to merge 2 commits into
nodejs:masterfrom
richardlau:releases
ConversationCommits (2)ChecksFiles changed
Closed

doc: make explicit reverting node_version.h changes#36461
richardlau wants to merge 2 commits into
nodejs:masterfrom
richardlau:releases

Conversation

richardlau commented Dec 9, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Add an explicit command to revert changes to node_version.h when
cherry-picking the release commit to the master branch.

cc @nodejs/releasers

Refs: #36460
Refs: #36385

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

doc: make explicit reverting node_version.h changes
61f69fb 
Add an explicit command to revert changes to `node_version.h` when
cherry-picking the release commit to the `master` branch.
nodejs-github-bot added the doc Issues and PRs related to the documentations. label Dec 9, 2020

danielleadams commented Dec 9, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Is there GitHub check/action that can be created to read node_version.h and check if the 1 has been flipped before merging? I suppose something that would also pass with the original PR release commit.

I follow the releases guide step by step though, so this would be helpful for me 👍🏼

richardlau commented Dec 9, 2020

Copy link
Copy Markdown
Member Author

Is there GitHub check/action that can be created to read node_version.h and check if the 1 has been flipped before merging? I suppose something that would also pass with the original PR release commit.

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 master branch which happens outside of the PR for the release (and there's no PR for the cherry-pick). Maybe something can be done in node-core-utils and the guide changed to use that? 🤷

MylesBorins approved these changes Dec 9, 2020
View reviewed changes

MylesBorins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

MylesBorins commented Dec 9, 2020

Copy link
Copy Markdown
Contributor

I know that @codebytere was working on the "land" portion of git node release... this seems like something that could be handled there once that bit of automation is complete

mhdawson approved these changes Dec 9, 2020
View reviewed changes

mhdawson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

targos commented Dec 10, 2020

Copy link
Copy Markdown
Member

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.

richardlau commented Dec 10, 2020

Copy link
Copy Markdown
Member Author

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 node_version.h. Tested with git cherry-pick f95d7152cb9f56b3d6ca8e107a01c199b235c0df (no conflicts in node_version.h) and git cherry-pick upstream/v15.x^ (conflicts in node_version.h).

bhaskarvilles commented Dec 11, 2020 via email

Copy link
Copy Markdown

richardlau added the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 16, 2020
github-actions Bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 16, 2020

github-actions Bot commented Dec 16, 2020

Copy link
Copy Markdown
Contributor

Landed in a150926...0b3caad

github-actions Bot closed this Dec 16, 2020
nodejs-github-bot pushed a commit that referenced this pull request Dec 16, 2020
doc: make explicit reverting node_version.h changes
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 <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
richardlau deleted the releases branch December 16, 2020 11:00
targos pushed a commit that referenced this pull request Dec 21, 2020
doc: make explicit reverting node_version.h changes
c3ec90d 
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 <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
targos mentioned this pull request Dec 22, 2020
Merged
targos pushed a commit that referenced this pull request May 1, 2021
doc: make explicit reverting node_version.h changes
c32c109 
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 <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
danielleadams mentioned this pull request May 3, 2021
Merged
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Trott Trott approved these changes
lpinca lpinca approved these changes
codebytere codebytere approved these changes
cjihrig cjihrig approved these changes
gireeshpunathil gireeshpunathil approved these changes
+5 more reviewers
fhinkel fhinkel approved these changes
MylesBorins MylesBorins approved these changes
targos targos approved these changes
danielleadams danielleadams approved these changes
mhdawson mhdawson approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

doc Issues and PRs related to the documentations.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Back | FazBrowse Home | New Git URL