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

Patch release (v2.17.1) #1559

Merged
merged 4 commits into from
Jan 16, 2023
Merged

Patch release (v2.17.1) #1559

merged 4 commits into from
Jan 16, 2023

Conversation

bquorning
Copy link
Collaborator

@bquorning bquorning commented Jan 16, 2023

Releasing v2.17.1 with the recent patches by @ydah but without #1519 from @pirj (which will be released as v2.18.0 soon after).

The v2.17.1 release will be cut from commit f510f1a.

bquorning and others added 4 commits January 16, 2023 07:40
…edicateMatcher

Fix an incorrect autocorrect for `RSpec/PredicateMatcher` when multiline expect and predicate method with heredoc
…Matcher

Fix a false positive for `RSpec/PredicateMatcher` when multiple arguments and not replaceable method
@bquorning bquorning marked this pull request as ready for review January 16, 2023 06:53
@bquorning bquorning requested a review from a team January 16, 2023 06:54
Copy link
Member

@pirj pirj left a comment

Choose a reason for hiding this comment

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

Thank you!

@koic
Copy link
Member

koic commented Jan 16, 2023

Nits: The branch name patch-release seems generic. How about creating a branch called 2-17-stable and cherry-picking it? e.g.:

% git checkout v2.17.0
% git checkout -b 2-17-stable
% git cherry-pick 3799e63e1fb5941e4f6a72f0f6d03be4aa5d2c37 # https://github.com/rubocop/rubocop-rspec/pull/1555
% git cherry-pick  5113d6f96ad536979710b361e3d6c101daa84da6 # https://github.com/rubocop/rubocop-rspec/pull/1554
% # Commit "Patch release (v2.17.1)"
% # Release

This branching strategy is used in rails/rails and ruby/ruby repos.

@pirj
Copy link
Member

pirj commented Jan 16, 2023

Our release timeline is linear, unlike Ruby or Rails'. We don't intend to make any further 2.17.x releases after 2.18 is released. With that in mind, 2.17-stable seems unnecessary.

@bquorning
Copy link
Collaborator Author

bquorning commented Jan 16, 2023

Yes, patch-release is intended as a throw-away branch. Even when we need to re-order commits to release a patch, I prefer to have a linear history, and have all these patch tags available in the master branch.

@bquorning bquorning merged commit 4a14cd9 into master Jan 16, 2023
@bquorning bquorning deleted the patch-release branch January 16, 2023 07:26
@koic
Copy link
Member

koic commented Jan 16, 2023

I get it! Thank you for the explanation and the bug fix release!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants