GeezerVisonThe World Wide Web, restored to 800 pixels of glory. | |||||||||||||||||||
| Home|About|Gaming cabinet|Archives|How it works|Starter sites | |||||||||||||||||||
GeezerVison is showing github.com — doc: add triaging for lts releases guide by BethGriggs · Pull Request #20165 · nodejs/node Conversation
|
|
How does this guide relate to the https://github.com/nodejs/node/blob/master/doc/guides/backporting-to-release-lines.md ? |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
Are the mechanics of backporting to LTS different from backporting to current? |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
@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. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
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. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
@nodejs/documentation PTAL |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
|
@BethGriggs is this still WIP? (Please use the labels for that by the way) |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
|
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. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
We really need this. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
+1 to reopening... closing this was premature. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
I have been on vacation - planning to sync up with @MylesBorins this week to progress this guide. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
@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? |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
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. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
01e9436 to
7a82142
Compare
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem 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.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
nit: remove --whitespace=fix #
Sorry, something went wrong.
There was an error while loading. Please reload this page.
c1f78e3 to
3087c7d
Compare
c81ec9e to
4847890
Compare
4847890 to
f53ed14
Compare
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
| 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.
There was an error while loading. Please reload this page.
f53ed14 to
cc7f4c7
Compare
|
Lite CI: https://ci.nodejs.org/job/node-test-pull-request-lite-pipeline/1818/ |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Add a section on triaging commits and PRs to land in releases.
cc7f4c7 to
de7a185
Compare
|
Lite CI: https://ci.nodejs.org/job/node-test-pull-request-lite-pipeline/1835/ |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
Landed in a845d7a |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
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]>
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]>
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]>
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]>
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]>
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]>
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]>
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]>
There was an error while loading. Please reload this page.
Successfully merging this pull request may close these issues.
There was an error while loading. Please reload this page.