From b9e1b93f07afb3d08a98fd2f5b2082feb674c6e8 Mon Sep 17 00:00:00 2001 From: toxix Date: Thu, 5 Feb 2015 00:35:21 +0100 Subject: [PATCH 1/2] ruby 2.2. support in .travis.yml exclude ruby 2.2. / AR 3.2 combination from test matrix https://github.com/inossidabile/protector/pull/61 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index c6e88e9..e1daada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,17 @@ rvm: - jruby-19mode - 2.0.0 - 2.1.0 + - 2.2.0 matrix: allow_failures: - gemfile: gemfiles/AR_edge.gemfile + exclude: + - gemfile: gemfiles/AR_3.2.gemfile + rvm: 2.2.0 + - gemfile: gemfiles/Rails_3.2.gemfile + rvm: 2.2.0 + gemfile: - gemfiles/AR_3.2.gemfile From b2e821e9dedd6e34cfd612ad53cdd03f08576fdb Mon Sep 17 00:00:00 2001 From: Toxix Date: Thu, 5 Feb 2015 01:00:04 +0100 Subject: [PATCH 2/2] update travis to test for rails/ar 4.0, 4.1 and 4.2 --- .travis.yml | 8 ++++++-- gemfiles/{AR_4.gemfile => AR_4.0.gemfile} | 0 gemfiles/AR_4.1.gemfile | 2 +- gemfiles/AR_4.2.gemfile | 18 ++++++++++++++++++ .../{Rails_4.gemfile => Rails_4.0.gemfile} | 2 +- gemfiles/Rails_4.1.gemfile | 19 +++++++++++++++++++ gemfiles/Rails_4.2.gemfile | 19 +++++++++++++++++++ 7 files changed, 64 insertions(+), 4 deletions(-) rename gemfiles/{AR_4.gemfile => AR_4.0.gemfile} (100%) create mode 100644 gemfiles/AR_4.2.gemfile rename gemfiles/{Rails_4.gemfile => Rails_4.0.gemfile} (96%) create mode 100644 gemfiles/Rails_4.1.gemfile create mode 100644 gemfiles/Rails_4.2.gemfile diff --git a/.travis.yml b/.travis.yml index e1daada..7184ca6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,14 @@ matrix: gemfile: - gemfiles/AR_3.2.gemfile - - gemfiles/AR_4.gemfile + - gemfiles/AR_4.0.gemfile + - gemfiles/AR_4.1.gemfile + - gemfiles/AR_4.2.gemfile - gemfiles/AR_edge.gemfile - gemfiles/Rails_3.2.gemfile - - gemfiles/Rails_4.gemfile + - gemfiles/Rails_4.0.gemfile + - gemfiles/Rails_4.1.gemfile + - gemfiles/Rails_4.2.gemfile - gemfiles/Sequel.gemfile script: bundle exec rspec diff --git a/gemfiles/AR_4.gemfile b/gemfiles/AR_4.0.gemfile similarity index 100% rename from gemfiles/AR_4.gemfile rename to gemfiles/AR_4.0.gemfile diff --git a/gemfiles/AR_4.1.gemfile b/gemfiles/AR_4.1.gemfile index 46abe2e..241b36e 100644 --- a/gemfiles/AR_4.1.gemfile +++ b/gemfiles/AR_4.1.gemfile @@ -12,7 +12,7 @@ gem "appraisal", :github=>"thoughtbot/appraisal" gem "sqlite3", :platform=>:ruby gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" gem "ruby-prof", :platform=>:ruby -gem "activerecord", "4.1.0.rc1", :require=>"active_record" +gem "activerecord", "4.1", :require=>"active_record" gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" gemspec :path=>".././" diff --git a/gemfiles/AR_4.2.gemfile b/gemfiles/AR_4.2.gemfile new file mode 100644 index 0000000..df9e780 --- /dev/null +++ b/gemfiles/AR_4.2.gemfile @@ -0,0 +1,18 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "colored" +gem "pry" +gem "rspec" +gem "simplecov", :require=>false +gem "simplecov-summary" +gem "appraisal", :github=>"thoughtbot/appraisal" +gem "sqlite3", :platform=>:ruby +gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" +gem "ruby-prof", :platform=>:ruby +gem "activerecord", "4.2", :require=>"active_record" +gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" + +gemspec :path=>".././" diff --git a/gemfiles/Rails_4.gemfile b/gemfiles/Rails_4.0.gemfile similarity index 96% rename from gemfiles/Rails_4.gemfile rename to gemfiles/Rails_4.0.gemfile index b5d3cc9..303c24f 100644 --- a/gemfiles/Rails_4.gemfile +++ b/gemfiles/Rails_4.0.gemfile @@ -13,7 +13,7 @@ gem "sqlite3", :platform=>:ruby gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" gem "ruby-prof", :platform=>:ruby gem "combustion", :github=>"pat/combustion", :ref=>"50a946b5a7ab3d9249f0e5fcebbb73488a91b1e5" -gem "rails", "4.0.0" +gem "rails", "4.0" gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" gemspec :path=>".././" diff --git a/gemfiles/Rails_4.1.gemfile b/gemfiles/Rails_4.1.gemfile new file mode 100644 index 0000000..1e11d03 --- /dev/null +++ b/gemfiles/Rails_4.1.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "colored" +gem "pry" +gem "rspec" +gem "simplecov", :require=>false +gem "simplecov-summary" +gem "appraisal", :github=>"thoughtbot/appraisal" +gem "sqlite3", :platform=>:ruby +gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" +gem "ruby-prof", :platform=>:ruby +gem "combustion", :github=>"pat/combustion", :ref=>"50a946b5a7ab3d9249f0e5fcebbb73488a91b1e5" +gem "rails", "4.1" +gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" + +gemspec :path=>".././" diff --git a/gemfiles/Rails_4.2.gemfile b/gemfiles/Rails_4.2.gemfile new file mode 100644 index 0000000..9ca6b94 --- /dev/null +++ b/gemfiles/Rails_4.2.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "colored" +gem "pry" +gem "rspec" +gem "simplecov", :require=>false +gem "simplecov-summary" +gem "appraisal", :github=>"thoughtbot/appraisal" +gem "sqlite3", :platform=>:ruby +gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" +gem "ruby-prof", :platform=>:ruby +gem "combustion", :github=>"pat/combustion", :ref=>"50a946b5a7ab3d9249f0e5fcebbb73488a91b1e5" +gem "rails", "4.2" +gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" + +gemspec :path=>".././"