Cleanup travis

stackshareio · Jul 5, 2020 · 67795a8 · 67795a8
1 parent 012a3ce
commit 67795a8
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 231 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,62 +16,18 @@ before_script:
   - psql -c 'create extension postgis;' -U postgres
 
 rvm:
-  - 2.4
-  - 2.5.0
+  - 2.6
+  - 2.7
   - ruby-head
-  - jruby
 
 gemfile:
-  - gemfiles/ar30.gemfile
-  - gemfiles/ar31.gemfile
-  - gemfiles/ar32.gemfile
-  - gemfiles/ar40.gemfile
-  - gemfiles/ar41.gemfile
-  - gemfiles/ar42.gemfile
-  - gemfiles/ar50.gemfile
-  - gemfiles/ar51.gemfile
+  - gemfiles/ar52.gemfile
+  - gemfiles/ar60.gemfile
   - gemfiles/ar-head.gemfile
 
-env:
-  global:
-    - "JRUBY_OPTS='--dev -J-Xmx1024M'"
-
 matrix:
-  exclude:
-    - gemfile: gemfiles/ar30.gemfile
-      rvm: 2.4
-    - gemfile: gemfiles/ar31.gemfile
-      rvm: 2.4
-    - gemfile: gemfiles/ar32.gemfile
-      rvm: 2.4
-    - gemfile: gemfiles/ar40.gemfile
-      rvm: 2.4
-    - gemfile: gemfiles/ar41.gemfile
-      rvm: 2.4
-    - gemfile: gemfiles/ar30.gemfile
-      rvm: 2.5.0
-    - gemfile: gemfiles/ar31.gemfile
-      rvm: 2.5.0
-    - gemfile: gemfiles/ar32.gemfile
-      rvm: 2.5.0
-    - gemfile: gemfiles/ar40.gemfile
-      rvm: 2.5.0
-    - gemfile: gemfiles/ar41.gemfile
-      rvm: 2.5.0
-    - gemfile: gemfiles/ar30.gemfile
-      rvm: ruby-head
-    - gemfile: gemfiles/ar31.gemfile
-      rvm: ruby-head
-    - gemfile: gemfiles/ar32.gemfile
-      rvm: ruby-head
-    - gemfile: gemfiles/ar40.gemfile
-      rvm: ruby-head
-    - gemfile: gemfiles/ar41.gemfile
-      rvm: ruby-head
-    - gemfile: gemfiles/ar-head.gemfile
-      rvm: 2.4
   allow_failures:
     - gemfile: gemfiles/ar-head.gemfile
+    - gemfile: gemfiles/ar60.gemfile
     - rvm: ruby-head
-    - rvm: jruby
   fast_finish: true
diff --git a/gemfiles/ar30.gemfile b/gemfiles/ar30.gemfile
diff --git a/gemfiles/ar31.gemfile b/gemfiles/ar31.gemfile
diff --git a/gemfiles/ar32.gemfile b/gemfiles/ar32.gemfile
diff --git a/gemfiles/ar40.gemfile b/gemfiles/ar40.gemfile
diff --git a/gemfiles/ar41.gemfile b/gemfiles/ar41.gemfile
diff --git a/gemfiles/ar42.gemfile b/gemfiles/ar42.gemfile
diff --git a/gemfiles/ar50.gemfile → gemfiles/ar52.gemfile b/gemfiles/ar50.gemfile → gemfiles/ar52.gemfile
@@ -5,7 +5,7 @@ gemspec :path => '../'
 
 
 gem 'rake'
-gem 'activerecord', '~> 5.0.0'
+gem 'activerecord', '~> 5.2.4'
 gem 'rspec'
 gem 'rack'
 gem 'timecop'

diff --git a/gemfiles/ar51.gemfile → gemfiles/ar60.gemfile b/gemfiles/ar51.gemfile → gemfiles/ar60.gemfile
@@ -5,7 +5,7 @@ gemspec :path => '../'
 
 
 gem 'rake'
-gem 'activerecord', '~> 5.1.0'
+gem 'activerecord', '~> 6.0.3'
 gem 'rspec'
 gem 'rack'
 gem 'timecop'