From e752e61c672052e7ef5a524782fef22953f7d158 Mon Sep 17 00:00:00 2001
From: Ryo Nakamura <r7kamura@gmail.com>
Date: Tue, 30 Nov 2021 03:35:55 +0900
Subject: [PATCH 1/4] Change rails branch name from master to main

---
 .travis.yml                   | 2 +-
 gemfiles/Gemfile-rails-main   | 4 ++++
 gemfiles/Gemfile-rails-master | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 gemfiles/Gemfile-rails-main
 delete mode 100644 gemfiles/Gemfile-rails-master

diff --git a/.travis.yml b/.travis.yml
index 8354e11..a6651ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ rvm:
 gemfile:
   - gemfiles/Gemfile-rails-5-2
   - gemfiles/Gemfile-rails-6-0
-  - gemfiles/Gemfile-rails-master
+  - gemfiles/Gemfile-rails-main
 matrix:
   allow_failures:
     - rvm: ruby-head
diff --git a/gemfiles/Gemfile-rails-main b/gemfiles/Gemfile-rails-main
new file mode 100644
index 0000000..6953313
--- /dev/null
+++ b/gemfiles/Gemfile-rails-main
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', git: "https://github.com/rails/rails.git", branch: 'main'
diff --git a/gemfiles/Gemfile-rails-master b/gemfiles/Gemfile-rails-master
deleted file mode 100644
index 1d1e2f6..0000000
--- a/gemfiles/Gemfile-rails-master
+++ /dev/null
@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec path: '..'
-
-gem 'actionpack', git: "https://github.com/rails/rails.git"

From faea731e8125ea17581401ddb88f7856b59c09a3 Mon Sep 17 00:00:00 2001
From: Ryo Nakamura <r7kamura@gmail.com>
Date: Tue, 30 Nov 2021 03:52:20 +0900
Subject: [PATCH 2/4] Exclude ruby 2.5 & 2.6 jobs from rails main

Rails no longer supports them at its main branch.
---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a6651ae..89bc878 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,11 @@ gemfile:
 matrix:
   allow_failures:
     - rvm: ruby-head
+  exclude:
+    - rvm: 2.5.3
+      gemfile: gemfiles/Gemfile-rails-main
+    - rvm: 2.6.5
+      gemfile: gemfiles/Gemfile-rails-main
   fast_finish: true
 env:
   global:

From bede4b70be54d30955e271ac82f28a32d4a1a90b Mon Sep 17 00:00:00 2001
From: Ryo Nakamura <r7kamura@gmail.com>
Date: Tue, 30 Nov 2021 04:22:12 +0900
Subject: [PATCH 3/4] Allow failures on rails main

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 89bc878..d6151ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ gemfile:
   - gemfiles/Gemfile-rails-main
 matrix:
   allow_failures:
+    - gemfile: gemfiles/Gemfile-rails-main
     - rvm: ruby-head
   exclude:
     - rvm: 2.5.3

From 7a9ae0f62e5c72787062e78c470bb993bee71ddf Mon Sep 17 00:00:00 2001
From: Ryo Nakamura <r7kamura@gmail.com>
Date: Tue, 30 Nov 2021 04:23:36 +0900
Subject: [PATCH 4/4] Remove unnecessary config about jruby

jruby testing was removed at 29b08536ca98204d34ef8dcbfae7a2379444d2a0.
---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6151ca..23654b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,3 @@ matrix:
     - rvm: 2.6.5
       gemfile: gemfiles/Gemfile-rails-main
   fast_finish: true
-env:
-  global:
-    - "JRUBY_OPTS=-Xcext.enabled=true"