From c47955bdbeeb0b7bdfcd3d0d0fd2d71f7c0f8f8f Mon Sep 17 00:00:00 2001 From: Stefan Wrobel Date: Sat, 24 Mar 2018 13:47:52 -0700 Subject: [PATCH 1/3] Fix mysql2 version for older rails --- gemfiles/activerecord_4.2.gemfile | 2 +- gemfiles/activerecord_5.0.gemfile | 2 +- gemfiles/activerecord_5.1.gemfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gemfiles/activerecord_4.2.gemfile b/gemfiles/activerecord_4.2.gemfile index 29ebb642..db2ea1b9 100644 --- a/gemfiles/activerecord_4.2.gemfile +++ b/gemfiles/activerecord_4.2.gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gem "activerecord", "~> 4.2.0" platforms :ruby, :rbx do - gem "mysql2" + gem "mysql2", '~> 0.4.10' gem "pg", '~> 0.21.0' gem "sqlite3" end diff --git a/gemfiles/activerecord_5.0.gemfile b/gemfiles/activerecord_5.0.gemfile index 72374d7a..ffa80ab8 100644 --- a/gemfiles/activerecord_5.0.gemfile +++ b/gemfiles/activerecord_5.0.gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gem "activerecord", "~> 5.0.0" platforms :ruby, :rbx do - gem "mysql2" + gem "mysql2", '~> 0.4.10' gem "pg", '~> 0.21.0' gem "sqlite3" end diff --git a/gemfiles/activerecord_5.1.gemfile b/gemfiles/activerecord_5.1.gemfile index ff3718ca..1199e093 100644 --- a/gemfiles/activerecord_5.1.gemfile +++ b/gemfiles/activerecord_5.1.gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gem "activerecord", "~> 5.1.0" platforms :ruby, :rbx do - gem "mysql2" + gem "mysql2", '~> 0.4.10' gem "pg" gem "sqlite3" end From 2edf82db88e719e1e50f7880b36e2119ef2fe2e5 Mon Sep 17 00:00:00 2001 From: Stefan Wrobel Date: Sat, 24 Mar 2018 13:49:13 -0700 Subject: [PATCH 2/3] Add appraisal for Rails 5.2 rc --- .travis.yml | 1 + gemfiles/activerecord_5.2.gemfile | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 gemfiles/activerecord_5.2.gemfile diff --git a/.travis.yml b/.travis.yml index b119ef57..32475af2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ rvm: # - rbx gemfile: + - gemfiles/activerecord_5.2.gemfile - gemfiles/activerecord_5.1.gemfile - gemfiles/activerecord_5.0.gemfile - gemfiles/activerecord_4.2.gemfile diff --git a/gemfiles/activerecord_5.2.gemfile b/gemfiles/activerecord_5.2.gemfile new file mode 100644 index 00000000..fab6fee5 --- /dev/null +++ b/gemfiles/activerecord_5.2.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", '~> 5.2.0.rc2' + +platforms :ruby, :rbx do + gem "mysql2", '~> 0.4.10' + gem "pg" + gem "sqlite3" +end + +platforms :jruby do + gem "activerecord-jdbcmysql-adapter" + gem "activerecord-jdbcpostgresql-adapter" + gem "activerecord-jdbcsqlite3-adapter" +end + +gemspec :path => "../" From 057ea110df237824968fe35e5666a2cf33731e9e Mon Sep 17 00:00:00 2001 From: Stefan Wrobel Date: Sat, 24 Mar 2018 23:31:05 -0700 Subject: [PATCH 3/3] Bump ruby patchlevels, test on 2.5 & 2.6 --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32475af2..adf8c142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,11 @@ cache: bundler sudo: false language: ruby rvm: - - 2.4.0 - - 2.3.3 - - 2.2.7 + - 2.6.0 + - 2.5.0 + - 2.4.3 + - 2.3.6 + - 2.2.9 # these haven't been passing for a while: # - jruby-head # - rbx @@ -28,3 +30,4 @@ matrix: - gemfile: gemfiles/activerecord_edge.gemfile - rvm: jruby-head - rvm: rbx + - rvm: 2.6.0