Skip to content

Modernize CI with Ruby 4.0, removing Rails 6.1 and 7.0, Ruby 3.0 and 3.1 #6

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

Closed
texpert wants to merge 11 commits into from
Closed

Modernize CI with Ruby 4.0, removing Rails 6.1 and 7.0, Ruby 3.0 and 3.1 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c26d7a
Modernize CI with Ruby 4.0, removing Rails 6.1 and 7.0, Ruby 3.0 and 3.1
texpert Feb 28, 2026
da755f6
Use non-digest-assets 2.6.0 on rails_edge.gemfile
texpert Feb 28, 2026
0bb1395
Remove unnecessary .mb_chars - it will be removed on Rails 8.2
texpert Feb 28, 2026
27c3c25
Revert using Rails.env.local? in front_cache_helper to allow running …
texpert Feb 28, 2026
1b10436
Update gemfiles/rails_edge.gemfile
texpert Feb 28, 2026
81fe455
Apply suggestions from code review
texpert Feb 28, 2026
9ad4d66
As suggested by GitHub Copilot:
texpert Feb 28, 2026
83c8538
Update .rubocop.yml
texpert Feb 28, 2026
a180e3e
Test rails_edge on ruby head as recommended by Copilot
texpert Feb 28, 2026
4e8b267
Restrict Rails version to ~> 8.1.0, as suggested by Brian
texpert Mar 8, 2026
064f440
Test unreleased Ruby against the last released Rails, and vice-versa,…
texpert Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions .github/workflows/current_support.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
lint:
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_6_1.gemfile
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_8_1.gemfile
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -18,7 +18,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: 3.1
ruby-version: 3.4

- name: Run linters
run: bundle exec rubocop
Expand All @@ -28,20 +28,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.0", 3.1, 3.2, 3.3, 3.4]
gemfile: [rails_6_1, rails_7_0, rails_7_1, rails_7_2, rails_8_0]
exclude:
# Rails < 7.0.1 is not compatible with Ruby 3.1+, and Rails 7.2 requires Ruby >= 3.1
- ruby: 3.1
gemfile: rails_6_1
- ruby: 3.2
gemfile: rails_6_1
- ruby: 3.0
gemfile: rails_7_2
- ruby: 3.0
gemfile: rails_8_0
- ruby: 3.1
gemfile: rails_8_0
ruby: ['3.2', '3.3', '3.4', '4.0']
gemfile: [rails_7_1, rails_7_2, rails_8_0, rails_8_1]
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
steps:
Expand All @@ -59,7 +47,7 @@ jobs:
with:
bundler-cache: true
ruby-version: ${{ matrix.ruby }}
rubygems: 3.5.18
rubygems: 3.7.2

- name: Migrate DB
run: bundle exec rake app:db:migrate
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/experimental_support.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ jobs:
fail-fast: false
matrix:
include:
- ruby: 3.4
- ruby: '4.0'
gemfile: rails_edge
- ruby: head
gemfile: rails_8_0
gemfile: rails_8_1
- ruby: head
gemfile: rails_edge
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
steps:
Expand Down
5 changes: 3 additions & 2 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
inherit_from: .rubocop_todo.yml

plugins: rubocop-rspec
plugins:
- rubocop-rspec

AllCops:
Exclude:
Expand All @@ -9,7 +10,7 @@ AllCops:
- /**/vendor/**/* # Exclude downloaded gem code in CI
NewCops: disable
SuggestExtensions: false
TargetRubyVersion: 3.0
TargetRubyVersion: 3.2
Comment thread
texpert marked this conversation as resolved.

Lint/MissingSuper:
Enabled: false
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
source 'https://rubygems.org'

gemspec
gem 'non-digest-assets', '2.5.0'
gem 'rails', '~> 8.0.1'

gem 'non-digest-assets', '2.6.0'
gem 'rails', '~> 8.1.0'
gem 'selenium-webdriver', '4.23.0'
gem 'sprockets-rails', '>= 3.5.2'

Expand Down
Loading