Skip to content

Commit

Permalink
Doublequote Ruby 3.0 and add Ruby 3.1 to testing matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
bensheldon committed Dec 30, 2021
1 parent 9ad3833 commit f9c8c69
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
ruby: [2.5, 2.6, 2.7, 3.0, jruby-9.2, jruby-9.3]
ruby: [2.5, 2.6, 2.7, "3.0", 3.1, jruby-9.2, jruby-9.3]
pg: [14]
include:
- ruby: 3.0
- ruby: "3.0"
pg: 10
- ruby: 3.0
- ruby: "3.0"
pg: 11
- ruby: 3.0
- ruby: "3.0"
pg: 12
- ruby: 3.0
- ruby: "3.0"
pg: 13
- ruby: jruby-9.3
pg: 10
Expand Down
20 changes: 12 additions & 8 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# frozen_string_literal: true
ruby_2 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
ruby_27_or_higher = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
ruby_31 = Gem::Version.new(RUBY_VERSION) == Gem::Version.new('3.1')
jruby = RUBY_PLATFORM.include?('java')

if ruby_2
Expand All @@ -18,16 +19,19 @@ appraise "rails-6.1" do
end

if ruby_27_or_higher && !jruby
# Rails HEAD requires MRI 2.7+
# Rails 7+ requires MRI 2.7+
# activerecord-jdbcpostgresql-adapter does not have a compatible version

appraise "rails-7.0" do
gem "rails", "~> 7.0.0"
gem "selenium-webdriver", "~> 4.0" # https://github.com/rails/rails/pull/43498
# Rails 7.0.0 is incompatible with Ruby 3.1
# https://gist.github.com/yahonda/2776d8d7b6ea7045359f38c10449937b
unless ruby_31
appraise "rails-7.0" do
gem "rails", "~> 7.0.0"
gem "selenium-webdriver", "~> 4.0" # https://github.com/rails/rails/pull/43498
end
end

# https://github.com/rails/rails/issues/43422
# appraise "rails-head" do
# gem "rails", github: "rails/rails", branch: "main"
# end
appraise "rails-head" do
gem "rails", github: "rails/rails", branch: "main"
end
end

0 comments on commit f9c8c69

Please sign in to comment.