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

[2.x] Support newer Rails 7.2 on CI. #3204

Draft
wants to merge 11 commits into
base: 2.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@ jobs:
- '6.0'
- '6.1'
- '7.0'
- '7.1'
- '7.2'
exclude:
- ruby: '3.2.2'
rails: '6.0'
- ruby: '3.0.3'
rails: '7.2'
runs-on: ubuntu-latest

env:
Expand All @@ -56,7 +60,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
# bundler-cache: true
bundler: default
bundler: 2.5.18
ruby-version: ${{ matrix.ruby }}

- name: Install PostgreSQL 11 client
Expand Down Expand Up @@ -143,7 +147,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
# bundler-cache: true
bundler: default
bundler: 2.5.18
ruby-version: ${{ matrix.ruby }}

- name: Install PostgreSQL 11 client
Expand Down
29 changes: 29 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
appraise "rails-6.0-ruby-#{ruby_version}" do
gem "rails", "~> 6.0.0"
gem "ransack", "~> 3.1.0"
gem "pagy", "~> 6.0"
end
end

Expand All @@ -10,6 +11,34 @@ end
appraise "rails-#{rails_version}-ruby-#{ruby_version}" do
gem "rails", "~> #{rails_version}.0"
gem "ransack", "~> 4.0.0"
gem "pagy", "~> 6.0"
end
end
end

["3.0.3", "3.2.2"].each do |ruby_version|
["7.1"].each do |rails_version|
appraise "rails-#{rails_version}-ruby-#{ruby_version}" do
gem "rails", "~> #{rails_version}.0"
gem "ransack", "~> 4.0.0"
gem "acts-as-taggable-on", "~> 10.0"
gem "puma", "~> 6.0"
gem "pagy", "~> 6.0"
end
end
end

["3.2.2"].each do |ruby_version|
["7.2"].each do |rails_version|
appraise "rails-#{rails_version}-ruby-#{ruby_version}" do
gem "rails", "~> #{rails_version}.0"
gem "ransack", "~> 4.2.0"
gem "acts-as-taggable-on", "~> 11.0"
gem "puma", "~> 6.0"
group :test do
gem "rspec-rails", "~> 6.0"
end
gem "pagy", "~> 8.0"
end
end
end
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "devise"
gem "database_cleaner"

gem "ruby-debug-ide", require: false
#
# END Dependencies for dummy_app
#

Expand Down Expand Up @@ -88,7 +86,7 @@ group :development, :test do
end

group :test do
gem "rspec-rails", "~> 4.0.0"
gem "rspec-rails", "~> 5.0"
gem "rails-controller-testing"
# Adds support for Capybara system testing and selenium driver
gem "capybara"
Expand Down
70 changes: 34 additions & 36 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ GEM
annotate (3.2.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)
appraisal (2.4.1)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
Expand Down Expand Up @@ -128,7 +128,7 @@ GEM
bootsnap (1.16.0)
msgpack (~> 1.2)
brakeman (5.4.0)
builder (3.2.4)
builder (3.3.0)
bump (0.10.0)
bundler-integrity (1.0.9)
byebug (11.1.3)
Expand All @@ -142,7 +142,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
chartkick (4.2.1)
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.4)
countries (4.2.3)
i18n_data (~> 0.16.0)
sixarm_ruby_unaccent (~> 1.1)
Expand All @@ -164,23 +164,24 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
docile (1.4.0)
dotenv (2.8.1)
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
dry-initializer (3.1.1)
erb-formatter (0.3.0)
erubi (1.12.0)
erubi (1.13.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (2.22.0)
i18n (>= 1.8.11, < 2)
ffi (1.15.5)
ffi (1.17.0)
ffi (1.17.0-x86_64-linux-gnu)
friendly_id (5.4.2)
activerecord (>= 4.0.0)
fuubar (2.5.1)
Expand All @@ -199,12 +200,12 @@ GEM
hotwire-livereload (1.2.3)
listen (>= 3.0.0)
rails (>= 6.0.0)
html_tokenizer (0.0.7)
html_tokenizer (0.0.8)
htmlbeautifier (1.4.2)
httparty (0.21.0)
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
i18n-tasks (1.0.12)
activesupport (>= 4.0.2)
Expand Down Expand Up @@ -236,7 +237,7 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.21.3)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -252,11 +253,11 @@ GEM
matrix (0.4.2)
meta-tags (2.18.0)
actionpack (>= 3.2.0, < 7.1)
method_source (1.0.0)
method_source (1.1.0)
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.19.0)
mini_portile2 (2.8.7)
minitest (5.25.1)
msgpack (1.5.6)
multi_xml (0.6.0)
net-imap (0.3.7)
Expand All @@ -269,13 +270,13 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.16.0)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.0-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
pagy (6.0.4)
pagy (8.6.3)
parallel (1.22.1)
parser (3.2.0.0)
ast (~> 2.4.1)
Expand All @@ -288,8 +289,8 @@ GEM
nio4r (~> 2.0)
pundit (2.2.0)
activesupport (>= 3.0.0)
racc (1.7.1)
rack (2.2.8)
racc (1.8.1)
rack (2.2.9)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.6)
Expand Down Expand Up @@ -328,7 +329,7 @@ GEM
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
rake (13.2.1)
ransack (4.0.0)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
Expand All @@ -342,23 +343,23 @@ GEM
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.6)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.1)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-mocks (3.11.1)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-rails (4.0.2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-support (~> 3.13.0)
rspec-rails (5.1.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.11.0)
rspec-support (3.13.1)
rubocop (1.35.1)
json (~> 2.3)
parallel (~> 1.10)
Expand All @@ -376,8 +377,6 @@ GEM
rubocop-ast (>= 0.4.0)
rubocop-shopify (2.5.0)
rubocop (~> 1.25)
ruby-debug-ide (0.7.3)
rake (>= 0.8.1)
ruby-progressbar (1.11.0)
ruby-vips (2.1.4)
ffi (~> 1.12)
Expand Down Expand Up @@ -414,7 +413,7 @@ GEM
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
test-prof (1.0.10)
thor (1.2.2)
thor (1.3.2)
timeout (0.4.0)
turbo-rails (1.4.0)
actionpack (>= 6.0.0)
Expand Down Expand Up @@ -450,7 +449,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.11)
zeitwerk (2.6.17)

PLATFORMS
ruby
Expand Down Expand Up @@ -509,10 +508,9 @@ DEPENDENCIES
rails-controller-testing
ransack
redis (~> 4.0)
rspec-rails (~> 4.0.0)
rspec-rails (~> 5.0)
rubocop
rubocop-shopify
ruby-debug-ide
selenium-webdriver
simplecov
simplecov-cobertura
Expand All @@ -529,4 +527,4 @@ DEPENDENCIES
zeitwerk

BUNDLED WITH
2.4.18
2.5.18
4 changes: 2 additions & 2 deletions gemfiles/rails_6.0_ruby_3.0.3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ gem "factory_bot_rails"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "devise"
gem "database_cleaner"
gem "ruby-debug-ide", require: false
gem "awesome_print"
gem "rubocop"
gem "rubocop-shopify", require: false
Expand Down Expand Up @@ -50,6 +49,7 @@ gem "image_processing", "~> 1.12"
gem "prefixed_ids"
gem "mapkick-rb", "~> 0.1.4"
gem "turbo_power", "~> 0.5.0"
gem "pagy", "~> 6.0"

group :development do
gem "standard"
Expand All @@ -67,7 +67,7 @@ group :development, :test do
end

group :test do
gem "rspec-rails", "~> 4.0.0"
gem "rspec-rails", "~> 5.0"
gem "rails-controller-testing"
gem "capybara"
gem "selenium-webdriver"
Expand Down
Loading
Loading