Setup rails 6.1 builds

Author: JonRowe

.travis.yml

@@ -38,6 +38,22 @@ script: "script/run_build 2>&1"
 
 matrix:
   include:
+    # Rails 6.1 builds >= 2.5
+    - rvm: ruby-3.0.0-preview1
+      env: RAILS_VERSION='master'
+      allow_failure: true
+    - rvm: 2.7.1
+      env: RAILS_VERSION='master'
+    - rvm: 2.6.6
+      env: RAILS_VERSION='master'
+    - rvm: 2.5.8
+      env: RAILS_VERSION='master'
+      jdk: oraclejdk11
+      env:
+        - RAILS_VERSION='master'
+        - JRUBY_OPT=--dev
+        - JAVA_OPTS="--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED"
+
     # Rails 6.0 builds >= 2.5.0
     - rvm: jruby-head
       jdk: oraclejdk11

Gemfile

@@ -26,7 +26,7 @@ MAJOR =
   case RAILS_VERSION
   when /5-2-stable/
     5
-  when /stable/, nil, false, ''
+  when /master/, /stable/, nil, false, ''
     6
   else
     /(\d+)[\.|-]\d+/.match(RAILS_VERSION).captures.first.to_i

Gemfile-rails-dependencies

@@ -1,7 +1,7 @@
 version_file = File.expand_path("../.rails-version", __FILE__)
 
 case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
-when /main/
+when /master/
   gem "rails", :git => "https://github.com/rails/rails.git"
   gem "arel", :git => "https://github.com/rails/arel.git"
   gem "journey", :git => "https://github.com/rails/journey.git"

Rakefile

@@ -27,10 +27,13 @@ RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
-  version = ENV.fetch("RAILS_VERSION", "~> 6.0.0")[/\d[\.-]\d/].tr('-', '.')
-  if version == "main" || version.nil?
-    version = Float::INFINITY
-  end
+  string_version = ENV.fetch("RAILS_VERSION", "~> 6.0.0")
+  version =
+    if string_version == "master" || string_version.nil?
+      Float::INFINITY
+    else
+      string_version[/\d[\.-]\d/].tr('-', '.')
+    end
   tags = []
 
   if version.to_f >= 5.1