From 2c217ff27abaf3e504dc589cb8599adf7c274a9e Mon Sep 17 00:00:00 2001
From: Nikita Bulai <bulaj.nikita@gmail.com>
Date: Sat, 6 Feb 2021 13:05:55 +0300
Subject: [PATCH] Update Travis config to use Rails 6.1

---
 .travis.yml                                   | 21 +++++++------------
 gemfiles/rails_5_1.gemfile                    | 20 ------------------
 .../{rails_5_0.gemfile => rails_6_1.gemfile}  |  4 ++--
 3 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 gemfiles/rails_5_1.gemfile
 rename gemfiles/{rails_5_0.gemfile => rails_6_1.gemfile} (82%)

diff --git a/.travis.yml b/.travis.yml
index 85aeb298f..eb542d7c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: ruby
 cache: bundler
 arch:
   - amd64
-  - ppc64le
   
 rvm:
   - 2.5
@@ -12,30 +11,24 @@ rvm:
   - ruby-head
 
 gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_6_1.gemfile
   - gemfiles/rails_master.gemfile
 
 matrix:
   fast_finish: true
   exclude:
-    - rvm: 3.0
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 3.0
-      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 3.0
       gemfile: gemfiles/rails_5_2.gemfile
-    # Run Danger only once
   include:
-    - rvm: 2.5
-      gemfile: gemfiles/rails_5_2.gemfile
+    # Run Danger only once
+    - rvm: 2.7
+      gemfile: gemfiles/rails_6_1.gemfile
       script: bundle exec danger
+    - rvm: 2.7
+      gemfile: gemfiles/rails_6_1.gemfile
+      arch: ppc64le
   allow_failures:
     - gemfile: gemfiles/rails_master.gemfile
     - rvm: ruby-head
-    - gemfile: gemfiles/rails_master.gemfile
-      arch: ppc64le
-    - rvm: ruby-head
-      arch: ppc64le
diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile
deleted file mode 100644
index 1ef05c488..000000000
--- a/gemfiles/rails_5_1.gemfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.1.0"
-gem "rspec-core"
-gem "rspec-expectations"
-gem "rspec-mocks"
-gem "rspec-rails", "~> 4.0"
-gem "rspec-support"
-gem "rubocop", "~> 0.80"
-gem "rubocop-performance", require: false
-gem "rubocop-rails", require: false
-gem "rubocop-rspec", require: false
-gem "bcrypt", "~> 3.1", require: false
-gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
-
-gemspec path: "../"
diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_6_1.gemfile
similarity index 82%
rename from gemfiles/rails_5_0.gemfile
rename to gemfiles/rails_6_1.gemfile
index a418bdff5..99e399029 100644
--- a/gemfiles/rails_5_0.gemfile
+++ b/gemfiles/rails_6_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 6.1.0"
 gem "rspec-core"
 gem "rspec-expectations"
 gem "rspec-mocks"
@@ -14,7 +14,7 @@ gem "rubocop-rails", require: false
 gem "rubocop-rspec", require: false
 gem "bcrypt", "~> 3.1", require: false
 gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-gem "sqlite3", "~> 1.3", "< 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
+gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw, :x64_mingw]
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
 
 gemspec path: "../"