Skip to content

Setup 5-1-maintenance without Rails 7 but with Ruby 3.1 #2562

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

Merged
merged 2 commits into from
Jan 22, 2022

Conversation

JonRowe
Copy link
Member

@JonRowe JonRowe commented Jan 19, 2022

Rails 7 will be supported in rspec-rails 6 via main, this just tracks Ruby 3.1 support into the upcoming 5.1.x release.

@pirj pirj mentioned this pull request Jan 20, 2022
21 tasks
@pirj pirj force-pushed the ruby-31-5-1-maintenance branch 2 times, most recently from 34c6391 to 3cc2457 Compare January 21, 2022 19:05
Add additional logic to the ActionMailer argument parsing to accomodate for differences under Ruby 3.1/Rails 6.1

Co-authored-by: Fabio Napoleoni <[email protected]>
Co-authored-by: Phil Pirozhkov <[email protected]>
@pirj pirj force-pushed the ruby-31-5-1-maintenance branch from 3cc2457 to a687a8e Compare January 21, 2022 19:08
@pirj
Copy link
Member

pirj commented Jan 21, 2022

Note to self - don't call branches ending with *-maintenance to prevent double the builds 😄

@pirj
Copy link
Member

pirj commented Jan 21, 2022

@JonRowe Green. Does it look good to you?
Fixes for Rails 7 and Ruby 3.1 got interleaved. I extracted the part that I could remember was specifically for Rails 7.

@pirj
Copy link
Member

pirj commented Jan 22, 2022

I'll go ahead and merge this.

@pirj pirj merged commit fae1360 into 5-1-maintenance Jan 22, 2022
@pirj pirj deleted the ruby-31-5-1-maintenance branch January 22, 2022 20:26
@JonRowe
Copy link
Member Author

JonRowe commented Jan 23, 2022

@pirj I'm going to be unpicking this a bit, it includes changes not needed, I was working on this on my machine but just hadn't responded.

@pirj
Copy link
Member

pirj commented Jan 23, 2022

Please let me know what you plan to remove from 5-1-maintenance. I may work on making the same changes on 5-0-maintenance in parallel.

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.

3 participants