Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: include updating release optional step #46089

Merged

Conversation

RafaelGSS
Copy link
Member

cc @nodejs/releasers

@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/tsc

@nodejs-github-bot nodejs-github-bot added the doc Issues and PRs related to the documentations. label Jan 4, 2023
conditions:

* Unstable CI
* Bad commit, requiring a git bisect and updating the proposal
Copy link
Member

Choose a reason for hiding this comment

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

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).

Copy link
Member Author

Choose a reason for hiding this comment

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

Just updated

Copy link
Member Author

@RafaelGSS RafaelGSS Jan 4, 2023

Choose a reason for hiding this comment

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

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.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done!

@RafaelGSS RafaelGSS force-pushed the doc/include-updating-release-step branch from 09c68ee to eebd1b8 Compare January 4, 2023 17:35
@RafaelGSS RafaelGSS force-pushed the doc/include-updating-release-step branch from eebd1b8 to 785f79d Compare January 4, 2023 20:04
@RafaelGSS RafaelGSS added the commit-queue Add this label to land a pull request using GitHub Actions. label Jan 6, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jan 6, 2023
@nodejs-github-bot nodejs-github-bot merged commit fd71d1a into nodejs:main Jan 6, 2023
@nodejs-github-bot
Copy link
Collaborator

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>
@RafaelGSS RafaelGSS mentioned this pull request Jan 20, 2023
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>
@juanarbol juanarbol mentioned this pull request Jan 28, 2023
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
Labels
doc Issues and PRs related to the documentations.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants