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.

Sign up for GitHub

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

Jump to bottom

Get the bin/rake release:prepare_patch ready for the next patch level prerelease #3839

Merged
merged 7 commits into from
Jul 19, 2020
Merged

Get the bin/rake release:prepare_patch ready for the next patch level prerelease #3839

merged 7 commits into from
Jul 19, 2020

Conversation

deivid-rodriguez
Copy link
Member

Description:

I'll be using this task for the next rc release. In this PR I tweak its behavior to:

  • Automatically cherry-pick all relevant changes for a patch level release (those labelled as "bundler: bug fix", "bundler: security fix", "bundler: minor enhancement", and "bundler: backport". I added this last category to be used for changes that need to be backported, but shouldn't be included in the changelog because of not being user-visible. In particular, I need this to backport several changes in the CHANGELOG format, so that the changelog tasks work on it.
  • Automatically bump the version number, generate all new changelog entries, and "cut the changelog", adding a new section header for the new release.

Tasks:

  • Describe the problem / feature
  • Write tests
  • Write code to solve the problem
  • Get code review from coworkers / friends

I will abide by the code of conduct.

@deivid-rodriguez
Allow backporting PRs that won't be logged in the changelog
d722e52 
Sometimes it's nice to cherry-pick PRs without user-visible changes,
because they prevent conflicts when cherry-picking relevant changes,
because they fix CI scripts to get CI green, and so on. I introduce the
`bundler: backport` label for this purpose.
@deivid-rodriguez
Bring release and labelling docs up to date
7f512ae
@deivid-rodriguez
Improve instructions
354e0e7
@deivid-rodriguez
Sort PRs by merged date to cherry-pick in order
3d10876 
Because of this, we no longer need to sort by the same criteria when
writing writing to the changelog.
@deivid-rodriguez
Normalize CHANGELOG.md date format
0faad1c
@deivid-rodriguez
Remove no longer needed rake task
684b11c
@deivid-rodriguez
Replace Changelog#sync! with Changelog#cut!
ac8d0c7 
The latter also adds a section header for the new release.
@deivid-rodriguez deivid-rodriguez merged commit b7cbcf2 into master Jul 19, 2020
@deivid-rodriguez deivid-rodriguez deleted the more_release_stuff branch July 19, 2020 13:45
deivid-rodriguez added a commit that referenced this pull request Oct 6, 2020
@deivid-rodriguez
Merge pull request #3839 from rubygems/more_release_stuff
6a219fe 
Get the `bin/rake release:prepare_patch` ready for the next patch level prerelease

(cherry picked from commit b7cbcf2)
deivid-rodriguez added a commit that referenced this pull request Oct 6, 2020
@deivid-rodriguez
Merge pull request #3839 from rubygems/more_release_stuff
4f06ab0 
Get the `bin/rake release:prepare_patch` ready for the next patch level prerelease

(cherry picked from commit b7cbcf2)
deivid-rodriguez added a commit that referenced this pull request Oct 6, 2020
@deivid-rodriguez
Merge pull request #3839 from rubygems/more_release_stuff
a52dcb5 
Get the `bin/rake release:prepare_patch` ready for the next patch level prerelease

(cherry picked from commit b7cbcf2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bundler: skip changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@deivid-rodriguez