From c2e13222b9469c6986556c2065cf351affa0cf2e Mon Sep 17 00:00:00 2001 From: Iain Beeston Date: Wed, 9 Jul 2014 13:24:42 +0100 Subject: [PATCH 1/4] Added activesupport 4.1 to the build matrix --- .travis.yml | 5 +++++ gemfiles/Gemfile.as-4.1.x | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 gemfiles/Gemfile.as-4.1.x diff --git a/.travis.yml b/.travis.yml index 1da3834..02822b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ gemfile: - gemfiles/Gemfile.as-3.1.x - gemfiles/Gemfile.as-3.2.x - gemfiles/Gemfile.as-4.0.x + - gemfiles/Gemfile.as-4.1.x matrix: include: @@ -21,5 +22,9 @@ matrix: rvm: 2.0.0 - gemfile: gemfiles/Gemfile.as-4.0.x rvm: 1.8.7 + - gemfile: gemfiles/Gemfile.as-4.1.x + rvm: 1.8.7 - gemfile: gemfiles/Gemfile.as-4.0.x rvm: 1.9.2 + - gemfile: gemfiles/Gemfile.as-4.1.x + rvm: 1.9.2 diff --git a/gemfiles/Gemfile.as-4.1.x b/gemfiles/Gemfile.as-4.1.x new file mode 100644 index 0000000..a26d925 --- /dev/null +++ b/gemfiles/Gemfile.as-4.1.x @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in oat.gemspec +gem 'activesupport', '~>4.1.4' +gemspec :path => "../" From 2a07775d7b42ece185a0ec44b4494b04b1fd8cd7 Mon Sep 17 00:00:00 2001 From: Iain Beeston Date: Wed, 9 Jul 2014 13:24:57 +0100 Subject: [PATCH 2/4] Added ruby 2.1.2 to the build matrix --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 02822b5..3e66c8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: ruby rvm: + - 2.1.2 - 2.0.0 - 1.9.3 - 1.9.2 @@ -20,6 +21,8 @@ matrix: exclude: - gemfile: gemfiles/Gemfile.as-2.3.x rvm: 2.0.0 + - gemfile: gemfiles/Gemfile.as-2.3.x + rvm: 2.1.2 - gemfile: gemfiles/Gemfile.as-4.0.x rvm: 1.8.7 - gemfile: gemfiles/Gemfile.as-4.1.x From cfaf0147edcae1280c0ede29dc0553695c510b47 Mon Sep 17 00:00:00 2001 From: Iain Beeston Date: Wed, 9 Jul 2014 13:26:44 +0100 Subject: [PATCH 3/4] Added jruby and rubinius to the build matrix --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3e66c8b..dfa2289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ rvm: - 1.9.3 - 1.9.2 - 1.8.7 + - jruby-1.7.11 + - rbx-2.2.9 gemfile: - gemfiles/Gemfile.as-2.3.x From f1f112c5315ccb8b69c768a9e6c55917b5a85d5a Mon Sep 17 00:00:00 2001 From: Iain Beeston Date: Wed, 9 Jul 2014 14:24:52 +0100 Subject: [PATCH 4/4] Pushed activesupport 2.3 out of the build matrix and into exception cases --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfa2289..d6740a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ rvm: - rbx-2.2.9 gemfile: - - gemfiles/Gemfile.as-2.3.x - gemfiles/Gemfile.as-3.0.x - gemfiles/Gemfile.as-3.1.x - gemfiles/Gemfile.as-3.2.x @@ -20,11 +19,13 @@ matrix: include: - gemfile: gemfiles/Gemfile.as-1.4.4 rvm: 1.8.7 - exclude: - gemfile: gemfiles/Gemfile.as-2.3.x - rvm: 2.0.0 + rvm: 1.8.7 - gemfile: gemfiles/Gemfile.as-2.3.x - rvm: 2.1.2 + rvm: 1.9.2 + - gemfile: gemfiles/Gemfile.as-2.3.x + rvm: 1.9.3 + exclude: - gemfile: gemfiles/Gemfile.as-4.0.x rvm: 1.8.7 - gemfile: gemfiles/Gemfile.as-4.1.x