Skip to content
Permalink
Browse files

Get Travis tests passing (#352)

* peg sqlite3 gems

* drop ruby 2.2 and 2.3

* tell travis to run mysql and postgres

sure, we're running both for both all 3 runs
so not perfectly optimal, but greatly simplifies the implementation

* reduce the build matrix

no reason to run so many ruby versions

* add tests for 6.0
  • Loading branch information...
kbrock authored and seuros committed Sep 13, 2019
1 parent 85e35fe commit 68d6dff8f293137b6eeb3c9de51141a8a4cfa830
@@ -2,13 +2,11 @@ cache: bundler
sudo: false
language: ruby
rvm:
- 2.6.0
- 2.5.1
- 2.4.4
- 2.3.6
- 2.2.10
- 2.6.3
- 2.5.5

gemfile:
- gemfiles/activerecord_6.0.gemfile
- gemfiles/activerecord_5.2.gemfile
- gemfiles/activerecord_5.1.gemfile
- gemfiles/activerecord_5.0.gemfile
@@ -20,11 +18,16 @@ env:
- DB=mysql
- DB=postgresql

services:
- mysql
- postgresql

script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all

matrix:
allow_failures:
- gemfile: gemfiles/activerecord_edge.gemfile
- rvm: jruby-head
- rvm: rbx
- rvm: 2.6.0
- gemfile: gemfiles/activerecord_edge.gemfile
- gemfile: gemfiles/activerecord_6.0.gemfile
exclude:
- rvm: 2.5.5
gemfile: gemfiles/activerecord_edge.gemfile
@@ -4,7 +4,7 @@ appraise 'activerecord-4.2' do
platforms :ruby do
gem 'mysql2', "< 0.5"
gem 'pg', "~> 0.21"
gem 'sqlite3'
gem 'sqlite3', '~> 1.3.13'
end

platforms :jruby do
@@ -19,7 +19,7 @@ appraise 'activerecord-5.0' do
platforms :ruby do
gem 'mysql2'
gem 'pg'
gem 'sqlite3'
gem 'sqlite3', '~> 1.3.13'
end

platforms :jruby do
@@ -34,7 +34,7 @@ appraise 'activerecord-5.1' do
platforms :ruby do
gem 'mysql2'
gem 'pg'
gem 'sqlite3'
gem 'sqlite3', '~> 1.3.13'
end

platforms :jruby do
@@ -59,6 +59,21 @@ appraise 'activerecord-5.2' do
end
end

appraise 'activerecord-6.0' do
gem 'activerecord', '~> 6.0.0'
platforms :ruby do
gem 'mysql2'
gem 'pg'
gem 'sqlite3'
end

platforms :jruby do
gem 'activerecord-jdbcmysql-adapter'
gem 'activerecord-jdbcpostgresql-adapter'
gem 'activerecord-jdbcsqlite3-adapter'
end
end

appraise 'activerecord-edge' do
gem 'activerecord', github: 'rails/rails'
platforms :ruby do
@@ -7,7 +7,7 @@ gem "activerecord", "~> 4.2.0"
platforms :ruby do
gem "mysql2", "< 0.5"
gem "pg", "~> 0.21"
gem "sqlite3"
gem "sqlite3", "~> 1.3.13"
end

platforms :jruby do
@@ -7,7 +7,7 @@ gem "activerecord", "~> 5.0.0"
platforms :ruby do
gem "mysql2"
gem "pg"
gem "sqlite3"
gem "sqlite3", "~> 1.3.13"
end

platforms :jruby do
@@ -7,7 +7,7 @@ gem "activerecord", "~> 5.1.0"
platforms :ruby do
gem "mysql2"
gem "pg"
gem "sqlite3"
gem "sqlite3", "~> 1.3.13"
end

platforms :jruby do
@@ -0,0 +1,19 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "~> 6.0.0"

platforms :ruby do
gem "mysql2"
gem "pg"
gem "sqlite3"
end

platforms :jruby do
gem "activerecord-jdbcmysql-adapter"
gem "activerecord-jdbcpostgresql-adapter"
gem "activerecord-jdbcsqlite3-adapter"
end

gemspec path: "../"

0 comments on commit 68d6dff

Please sign in to comment.
You can’t perform that action at this time.