doc: include updating release optional step #46089
Merged
+45
−0
Conversation
This file contains 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
|
Review requested:
|
richardlau
reviewed
Jan 4, 2023
RafaelGSS
force-pushed
the
doc/include-updating-release-step
branch
from
833a9c4
to
09c68ee
Compare
richardlau
approved these changes
Jan 4, 2023
ruyadorno
approved these changes
Jan 4, 2023
BethGriggs
reviewed
Jan 4, 2023
doc/contributing/releases.md
Outdated
| conditions: | ||
|
|
||
| * Unstable CI | ||
| * Bad commit, requiring a git bisect and updating the proposal |
There was a problem hiding this comment.
I think it'd be useful to have the Git steps documented in this section for when we need to remove or adjust commits in the release. As a draft suggestion, I think including steps like this would be useful:
Remove or adjust problematic commit(s):
# update staging
git checkout staging
git rebase -i ... # rebase to drop or edit the bad commit(s)
git push -f upstream staging
# rebase proposal against the updated staging branch
git checkout proposal
git rebase upstream/staging
Reminder to re-run changelog-maker and update the changelog to include the new/changed Git SHAs. (Easily forgotten).
There was a problem hiding this comment.
Actually, it's missing a fix. In case of dropping a commit, we need to reset the branch instead of rebasing
git reset --hard upstream/staging
I'll adjust it.
RafaelGSS
force-pushed
the
doc/include-updating-release-step
branch
from
09c68ee
to
eebd1b8
Compare
RafaelGSS
force-pushed
the
doc/include-updating-release-step
branch
from
eebd1b8
to
785f79d
Compare
BethGriggs
approved these changes
Jan 6, 2023
RafaelGSS
added
the
commit-queue
nodejs-github-bot
removed
the
commit-queue
|
Landed in fd71d1a |
RafaelGSS
added a commit
to RafaelGSS/node
that referenced
this pull request
Jan 17, 2023
PR-URL: nodejs#46089 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Ruy Adorno <ruyadorno@google.com> Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
RafaelGSS
added a commit
that referenced
this pull request
Jan 20, 2023
PR-URL: #46089 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Ruy Adorno <ruyadorno@google.com> Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
Merged
juanarbol
pushed a commit
that referenced
this pull request
Jan 26, 2023
PR-URL: #46089 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Ruy Adorno <ruyadorno@google.com> Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
Merged
juanarbol
pushed a commit
that referenced
this pull request
Jan 31, 2023
PR-URL: #46089 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Ruy Adorno <ruyadorno@google.com> Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
cc @nodejs/releasers