From 9e658f2bcf676cc76e834bbe04b5e990cb34d07a Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Tue, 10 Sep 2019 13:35:49 -0400 Subject: [PATCH 1/5] peg sqlite3 gems --- Appraisals | 6 +++--- gemfiles/activerecord_4.2.gemfile | 2 +- gemfiles/activerecord_5.0.gemfile | 2 +- gemfiles/activerecord_5.1.gemfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Appraisals b/Appraisals index 0b783fac..158650d4 100644 --- a/Appraisals +++ b/Appraisals @@ -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 diff --git a/gemfiles/activerecord_4.2.gemfile b/gemfiles/activerecord_4.2.gemfile index ba3a7fd9..c34356de 100644 --- a/gemfiles/activerecord_4.2.gemfile +++ b/gemfiles/activerecord_4.2.gemfile @@ -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 diff --git a/gemfiles/activerecord_5.0.gemfile b/gemfiles/activerecord_5.0.gemfile index 933e74d7..da91aa40 100644 --- a/gemfiles/activerecord_5.0.gemfile +++ b/gemfiles/activerecord_5.0.gemfile @@ -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 diff --git a/gemfiles/activerecord_5.1.gemfile b/gemfiles/activerecord_5.1.gemfile index cbe5aea1..0b981bb6 100644 --- a/gemfiles/activerecord_5.1.gemfile +++ b/gemfiles/activerecord_5.1.gemfile @@ -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 From 0c1c98df338dc4cee44eab318927ed345e5834e8 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Tue, 10 Sep 2019 13:35:59 -0400 Subject: [PATCH 2/5] drop ruby 2.2 and 2.3 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b78e3e8..b2e62990 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ rvm: - 2.6.0 - 2.5.1 - 2.4.4 - - 2.3.6 - - 2.2.10 gemfile: - gemfiles/activerecord_5.2.gemfile From 1ef466e4a64bae880f9aae29fc2e677698999ff1 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Tue, 10 Sep 2019 13:36:37 -0400 Subject: [PATCH 3/5] 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 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index b2e62990..3ca5336e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,10 @@ env: - DB=mysql - DB=postgresql +services: + - mysql + - postgresql + script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all matrix: From bb053c58e1da7d2f6f2602d0c022e18dfb26c534 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Tue, 10 Sep 2019 14:02:06 -0400 Subject: [PATCH 4/5] reduce the build matrix no reason to run so many ruby versions --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ca5336e..472b4fed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ cache: bundler sudo: false language: ruby rvm: - - 2.6.0 - - 2.5.1 - - 2.4.4 + - 2.6.3 + - 2.5.5 gemfile: - gemfiles/activerecord_5.2.gemfile @@ -27,6 +26,6 @@ script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:a matrix: allow_failures: - gemfile: gemfiles/activerecord_edge.gemfile - - rvm: jruby-head - - rvm: rbx - - rvm: 2.6.0 + exclude: + - rvm: 2.5.5 + gemfile: gemfiles/activerecord_edge.gemfile From 8a4ea04b91a2090808ce99636a09bd8cb328b29b Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Tue, 10 Sep 2019 18:39:00 -0400 Subject: [PATCH 5/5] add tests for 6.0 --- .travis.yml | 4 +++- Appraisals | 15 +++++++++++++++ gemfiles/activerecord_6.0.gemfile | 19 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gemfiles/activerecord_6.0.gemfile diff --git a/.travis.yml b/.travis.yml index 472b4fed..63f8aa98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ rvm: - 2.5.5 gemfile: + - gemfiles/activerecord_6.0.gemfile - gemfiles/activerecord_5.2.gemfile - gemfiles/activerecord_5.1.gemfile - gemfiles/activerecord_5.0.gemfile @@ -25,7 +26,8 @@ script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:a matrix: allow_failures: - - gemfile: gemfiles/activerecord_edge.gemfile + - gemfile: gemfiles/activerecord_edge.gemfile + - gemfile: gemfiles/activerecord_6.0.gemfile exclude: - rvm: 2.5.5 gemfile: gemfiles/activerecord_edge.gemfile diff --git a/Appraisals b/Appraisals index 158650d4..bbb038a0 100644 --- a/Appraisals +++ b/Appraisals @@ -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 diff --git a/gemfiles/activerecord_6.0.gemfile b/gemfiles/activerecord_6.0.gemfile new file mode 100644 index 00000000..0e0233e6 --- /dev/null +++ b/gemfiles/activerecord_6.0.gemfile @@ -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: "../"