GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — doc: add triaging for lts releases guide by BethGriggs · Pull Request #20165 · nodejs/node

Conversation

@BethGriggs

@BethGriggs BethGriggs commented Apr 20, 2018 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

Adds info for backporting commits and PRs to LTS branches.

If we can get a guideline process agreed and written down, it should make it easier for more people to help out with the backporting.

//cc @gibfahn, @MylesBorins

Checklist
  • documentation is changed or added
  • commit message follows commit guidelines

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@nodejs-github-bot nodejs-github-bot added the doc Issues and PRs related to Node.js documentation. label Apr 20, 2018
@vsemozhetbyt

vsemozhetbyt commented Apr 20, 2018 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

How does this guide relate to the https://github.com/nodejs/node/blob/master/doc/guides/backporting-to-release-lines.md ?

richardlau reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@vsemozhetbyt vsemozhetbyt added meta Issues and PRs related to the general management of the project. lts Issues and PRs related to Long-Term Support (LTS) releases. labels Apr 20, 2018
@richardlau

richardlau commented Apr 20, 2018

Copy link
Copy Markdown
Member

Are the mechanics of backporting to LTS different from backporting to current?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@MylesBorins MylesBorins self-assigned this Apr 20, 2018
@MylesBorins

MylesBorins commented Apr 20, 2018

Copy link
Copy Markdown
Contributor

@vsemozhetbyt I'll review both documents and see if there is value in merging them or having different docs... might be good to have a separate one specifically about triaging.

@richardlau backporting to LTS is the same for external collaborators. Triaging and landing commits (backport and from release lines) is different.

vsemozhetbyt reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@BethGriggs

BethGriggs commented Apr 20, 2018

Copy link
Copy Markdown
Member Author

backporting-to-release-lines currently instructs contributors on how to open a backport PR, whereas this guide would document the process of landing the backport PRs/triaging commits to land. Initially I separated it out as I thought it may be confusing to show how to open a backport commit (applicable to any contributor) in the same place as how to land backport PRs/commits on staging branches (collaborator specific).

Perhaps any additional content should just be merged and expand the COLLABORATOR_GUIDE.md#technical-howto?

The main aim is to make it easier/clearer for any collaborator to traige and pull commits into the staging branches.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@BridgeAR

BridgeAR commented Apr 25, 2018

Copy link
Copy Markdown
Member

@nodejs/documentation PTAL

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@BridgeAR

BridgeAR commented Apr 25, 2018 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

@BethGriggs is this still WIP? (Please use the labels for that by the way)

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@BridgeAR BridgeAR added the wip Issues and PRs that are still a work in progress. label Apr 25, 2018
mhdawson
mhdawson reviewed May 10, 2018
View reviewed changes
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@mhdawson mhdawson May 10, 2018

Copy link
Copy Markdown
Member

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.

Should this be called "Creating a release" instead.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

+1 to preparing an LTS release or Triaging for LTS releases

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
Trott
Trott reviewed May 23, 2018
View reviewed changes
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@Trott Trott May 23, 2018

Copy link
Copy Markdown
Member

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.

Nit: shas -> SHAs or even SHA checksums or whatever the best word (instead of checksums) might be there (commit hashes?).

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@BridgeAR

BridgeAR commented May 29, 2018

Copy link
Copy Markdown
Member

Closing due to no response. @BethGriggs please feel free to reopen / leave a comment in case you would like to work on this again or open a new PR.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@BridgeAR BridgeAR closed this May 29, 2018
@gibfahn

gibfahn commented May 29, 2018

Copy link
Copy Markdown
Member

We really need this.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@gibfahn gibfahn reopened this May 29, 2018
@jasnell

jasnell commented May 29, 2018

Copy link
Copy Markdown
Member

+1 to reopening... closing this was premature.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@BethGriggs

BethGriggs commented May 31, 2018

Copy link
Copy Markdown
Member Author

I have been on vacation - planning to sync up with @MylesBorins this week to progress this guide.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@BethGriggs

BethGriggs commented Jun 5, 2018

Copy link
Copy Markdown
Member Author

@MylesBorins, what do you think should happen to this guide based on discussions at the Berlin summit about a process change (e.g. about utilizing minor and patch branches from @BridgeAR)? Have we written that proposal down anywhere?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@gibfahn

gibfahn commented Jun 5, 2018

Copy link
Copy Markdown
Member

@MylesBorins, what do you think should happen to this guide based on discussions at the Berlin summit about a process change (e.g. about utilizing minor and patch branches from @BridgeAR)?

Not Myles Borins 😁, but my preference would be to document the process as is, and then we can use the PR to update it with the new proposal to discuss how exactly that should work.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

MylesBorins
MylesBorins reviewed Jun 5, 2018
View reviewed changes

@MylesBorins MylesBorins left a comment

Copy link
Copy Markdown
Contributor

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.

So I've added some comments in line.

I'm curious, this guide mostly breaks down to a handful of git-fu. Perhaps it makes sense to make a separate git guide for core that includes aliases and techniques and focus on how to decide if a commit should land and branch-diff techniques for this guide?

Also open to landing all the things in here, but there is the risk of repeated information

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

+1 to preparing an LTS release or Triaging for LTS releases

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

can you explain --origin DANGER rather than upstream which is usually the convention I've seen used

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

@BethGriggs BethGriggs Jun 7, 2018

Copy link
Copy Markdown
Member Author

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.

That was a suggestion from @gibfahn for my setup - i'll swap it back to upstream so that it is consistent with other docs.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

i usually do git remote update -p

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

alternatively you can fix this manually while landing

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

I've ended up removing --whitespace=fix as it can cause some serious issues with certain backports.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

sometimes I'll just run the tests for the PR in question when backporting rather than running all the tests

see: https://github.com/MylesBorins/dot-files/blob/master/.bash_profile#L64

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

branch-diff vX.x-staging upstream/vY.x -exclude-label semver-major,semver-minor,dont-land-on-vX.x,backport-requested-vX.x,backported-to-vX.x,baking-for-lts --filter-release

where X = LTS branch and Y = Current branch

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

$ branch-diff vX.x-staging upstream/master --exclude-label semver-major,dont-land-on-vX.x,backport-requested-vX.x,backported-to-vX.x --filter-release --format=sha --reverse > commits
$ cat commits | xargs git cherry-pick

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
Comment thread doc/guides/backport-to-lts-branches.md Outdated

@MylesBorins MylesBorins Jun 5, 2018

Copy link
Copy Markdown
Contributor

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.

this will only work when doing the above step

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@BethGriggs
BethGriggs force-pushed the backporting-guide branch from 01e9436 to 7a82142 Compare June 8, 2018 11:12
@BethGriggs BethGriggs changed the title [WIP] doc: add backporting to LTS branches guide [WIP] doc: add triaging for lts releases guide Jun 8, 2018
codebytere
codebytere reviewed Aug 2, 2018
View reviewed changes
Comment thread doc/guides/triaging-for-lts-releases.md Outdated

@codebytere codebytere Aug 2, 2018

Copy link
Copy Markdown
Member

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.

I'd say this should come at the top before the Triage PRs section potentially?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
codebytere
codebytere reviewed Aug 2, 2018
View reviewed changes
Comment thread doc/guides/triaging-for-lts-releases.md Outdated

@codebytere codebytere Aug 2, 2018

Copy link
Copy Markdown
Member

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.

For ease of understanding it might be helpful to add that this patch flow also applies to commits, and add a section to commit triaging that includes an example similar to:
$ git pa https://github.com/nodejs/node/commit/1a2b3c4d

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
codebytere
codebytere reviewed Aug 2, 2018
View reviewed changes
Comment thread doc/guides/triaging-for-lts-releases.md Outdated

@codebytere codebytere Aug 2, 2018

Copy link
Copy Markdown
Member

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.

nit: remove --whitespace=fix #

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
@BethGriggs
BethGriggs force-pushed the backporting-guide branch 3 times, most recently from c1f78e3 to 3087c7d Compare October 9, 2018 10:36
@BethGriggs
BethGriggs force-pushed the backporting-guide branch from c81ec9e to 4847890 Compare November 22, 2018 13:14
gireeshpunathil
gireeshpunathil approved these changes Dec 3, 2018
View reviewed changes
@BethGriggs
BethGriggs force-pushed the backporting-guide branch from 4847890 to f53ed14 Compare December 3, 2018 16:11
richardlau
richardlau approved these changes Dec 3, 2018
View reviewed changes
Comment thread doc/releases.md Outdated

@richardlau richardlau Dec 3, 2018

Copy link
Copy Markdown
Member

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.

Suggested change
Go through PRs with the label `vN.x`. e.g. [PRs with the v8.x label](https://github.com/nodejs/node/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+label%3Av8.x).
Go through PRs with the label `vN.x`. e.g. [PRs with the `v8.x` label](https://github.com/nodejs/node/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+label%3Av8.x).

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
@BethGriggs
BethGriggs force-pushed the backporting-guide branch from f53ed14 to cc7f4c7 Compare December 3, 2018 18:32
@Trott

Trott commented Dec 4, 2018

Copy link
Copy Markdown
Member

Lite CI: https://ci.nodejs.org/job/node-test-pull-request-lite-pipeline/1818/

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

BethGriggs and others added 2 commits December 4, 2018 18:27
@BethGriggs @Trott
doc: add triaging section to releases.md
72de921
Add a section on triaging commits and PRs to land in releases.
@Trott
fixup! doc: add triaging section to releases.md
de7a185
@Trott
Trott force-pushed the backporting-guide branch from cc7f4c7 to de7a185 Compare December 5, 2018 02:27
@Trott

Trott commented Dec 5, 2018

Copy link
Copy Markdown
Member

Lite CI: https://ci.nodejs.org/job/node-test-pull-request-lite-pipeline/1835/

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@Trott Trott added the author ready PRs with CI started, the required approvals, and no outstanding review comments. label Dec 5, 2018
@Trott

Trott commented Dec 5, 2018

Copy link
Copy Markdown
Member

Landed in a845d7a

BethGriggs reacted with hooray emoji
All reactions
  • 🎉 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@Trott Trott closed this Dec 5, 2018
Trott pushed a commit to Trott/io.js that referenced this pull request Dec 5, 2018
@BethGriggs @Trott
doc: add triaging section to releases.md
a845d7a
Add a section on triaging commits and PRs to land in releases.

PR-URL: nodejs#20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
BridgeAR pushed a commit that referenced this pull request Dec 5, 2018
@BethGriggs @BridgeAR
doc: add triaging section to releases.md
cf0f49f
Add a section on triaging commits and PRs to land in releases.

PR-URL: #20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
@BridgeAR BridgeAR mentioned this pull request Dec 5, 2018
v11.4.0 proposal #24854
Merged
4 tasks done
BridgeAR pushed a commit that referenced this pull request Dec 7, 2018
@BethGriggs @BridgeAR
doc: add triaging section to releases.md
162b3a1
Add a section on triaging commits and PRs to land in releases.

PR-URL: #20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
BridgeAR pushed a commit that referenced this pull request Dec 7, 2018
@BethGriggs @BridgeAR
doc: add triaging section to releases.md
be24e63
Add a section on triaging commits and PRs to land in releases.

PR-URL: #20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
This was referenced Dec 7, 2018
2018-12-07 Version 11.4.0 (Current) @BridgeAR beevelop/docker-android-nodejs#261
Closed
2018-12-07 Version 11.4.0 (Current) @BridgeAR beevelop/docker-android-nodejs#262
Closed
2018-12-07 Version 11.4.0 (Current) @BridgeAR beevelop/docker-android-nodejs#263
Closed
2018-12-07 Version 11.4.0 (Current) @BridgeAR beevelop/docker-android-nodejs#264
Closed
2018-12-07 Version 11.4.0 (Current) @BridgeAR beevelop/docker-android-nodejs#265
Closed
refack pushed a commit to refack/node that referenced this pull request Jan 14, 2019
@BethGriggs @refack
doc: add triaging section to releases.md
e843789
Add a section on triaging commits and PRs to land in releases.

PR-URL: nodejs#20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
BethGriggs added a commit that referenced this pull request Feb 12, 2019
@BethGriggs
doc: add triaging section to releases.md
23cd76e
Add a section on triaging commits and PRs to land in releases.

PR-URL: #20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
@BethGriggs BethGriggs mentioned this pull request Feb 12, 2019
v10.15.3 proposal #26063
Merged
BethGriggs added a commit that referenced this pull request Feb 20, 2019
@BethGriggs
doc: add triaging section to releases.md
d150995
Add a section on triaging commits and PRs to land in releases.

PR-URL: #20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
rvagg pushed a commit that referenced this pull request Feb 28, 2019
@BethGriggs @rvagg
doc: add triaging section to releases.md
25b72c9
Add a section on triaging commits and PRs to land in releases.

PR-URL: #20165
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
@BethGriggs
BethGriggs deleted the backporting-guide branch June 11, 2019 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Trott Trott Trott left review comments
@codebytere codebytere codebytere left review comments
@jasnell jasnell jasnell approved these changes
@richardlau richardlau richardlau approved these changes
@gireeshpunathil gireeshpunathil gireeshpunathil approved these changes
+4 more reviewers
@MylesBorins MylesBorins MylesBorins left review comments
@thefourtheye thefourtheye thefourtheye left review comments
@targos targos targos left review comments
@mhdawson mhdawson mhdawson left review comments
Reviewers whose approvals may not affect merge requirements

Uh oh!

There was an error while loading. Please reload this page.

Assignees

@MylesBorins MylesBorins

Labels

author ready PRs with CI started, the required approvals, and no outstanding review comments. doc Issues and PRs related to Node.js documentation. lts Issues and PRs related to Long-Term Support (LTS) releases. meta Issues and PRs related to the general management of the project.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

14 participants

@BethGriggs @vsemozhetbyt @richardlau @MylesBorins @BridgeAR @gibfahn @jasnell @Trott @thefourtheye @codebytere @targos @gireeshpunathil @mhdawson @nodejs-github-bot
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.