Update the build matrix (ruby & rails versions)

wvanbergen · Oct 1, 2019 · ea5897a · ea5897a
1 parent bd627dc
commit ea5897a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,23 +5,12 @@ services:
   - mysql
 
 rvm:
-- 2.2.2
-- 2.3.0
-- 2.4.1
-- 2.5.0
+- '2.5'
+- '2.6'
 
 gemfile:
-  - gemfiles/Gemfile.activerecord50
-  - gemfiles/Gemfile.activerecord51
   - gemfiles/Gemfile.activerecord52
-  - gemfiles/Gemfile.activerecord-edge
-
-matrix:
-  exclude:
-    - rvm: 2.2.2
-      gemfile: gemfiles/Gemfile.activerecord-edge
-    - rvm: 2.3.0
-      gemfile: gemfiles/Gemfile.activerecord-edge
+  - gemfiles/Gemfile.activerecord60
 
 before_script:
 - mysql -e 'create database database_validations;'
diff --git a/gemfiles/Gemfile.activerecord-edge b/gemfiles/Gemfile.activerecord-edge
diff --git a/gemfiles/Gemfile.activerecord51 b/gemfiles/Gemfile.activerecord51
diff --git a/gemfiles/Gemfile.activerecord52 b/gemfiles/Gemfile.activerecord52
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec path: '..'
 
-gem 'activerecord', github: 'rails/rails', branch: '5-2-stable'
+gem 'activerecord', '~> 5.2.0'
diff --git a/gemfiles/Gemfile.activerecord50 → gemfiles/Gemfile.activerecord60 b/gemfiles/Gemfile.activerecord50 → gemfiles/Gemfile.activerecord60
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec path: '..'
 
-gem 'activerecord', '~> 5.0.0'
+gem 'activerecord', '~> 6.0.0'