Skip to content

Conversation

@richardlau
Copy link
Member

@richardlaurichardlau commented Dec 9, 2020

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

Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch.
@nodejs-github-botnodejs-github-bot added the doc Issues and PRs related to the documentations. label Dec 9, 2020
@danielleadams
Copy link
Contributor

danielleadams commented Dec 9, 2020

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
Copy link
MemberAuthor

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? 🤷

Copy link
Contributor

@MylesBorinsMylesBorins left a comment

Choose a reason for hiding this comment

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

LGTM

@MylesBorins
Copy link
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

Copy link
Member

@mhdawsonmhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@targos
Copy link
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
Copy link
MemberAuthor

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
Copy link

bhaskarvilles commented Dec 11, 2020 via email

@richardlaurichardlau added the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 16, 2020
@github-actionsgithub-actionsbot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 16, 2020
@github-actions
Copy link
Contributor

Landed in a150926...0b3caad

nodejs-github-bot pushed a commit that referenced this pull request Dec 16, 2020
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]>
@richardlaurichardlau deleted the releases branch December 16, 2020 11:00
targos pushed a commit that referenced this pull request Dec 21, 2020
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]>
@targostargos mentioned this pull request Dec 22, 2020
targos pushed a commit that referenced this pull request May 1, 2021
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]>
@danielleadamsdanielleadams mentioned this pull request May 3, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docIssues and PRs related to the documentations.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

13 participants

@richardlau@danielleadams@MylesBorins@targos@bhaskarvilles@fhinkel@Trott@lpinca@codebytere@cjihrig@gireeshpunathil@mhdawson@nodejs-github-bot