From 55427d42c257584e4261f90902e9f087f80b2e29 Mon Sep 17 00:00:00 2001 From: ian douglas Date: Mon, 26 Dec 2016 13:29:28 -0700 Subject: [PATCH 1/2] testing rails 5 on travis --- .travis.yml | 20 ++++++++++++++++++++ bin/run_tests.sh | 19 ++++++------------- gemfiles/Gemfile.rails-5.0 | 8 ++++++++ 3 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 gemfiles/Gemfile.rails-5.0 diff --git a/.travis.yml b/.travis.yml index 4c484e5..2e06ff4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,26 +5,46 @@ matrix: include: - rvm: 1.9.3 gemfile: gemfiles/Gemfile.rails-3.X + - rvm: 1.9.3 + gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 1.9.3 gemfile: gemfiles/Gemfile.rails-4.2 + - rvm: 1.9.3 + gemfile: gemfiles/Gemfile.rails-5.0 + - rvm: 2.0.0 gemfile: gemfiles/Gemfile.rails-3.X - rvm: 2.0.0 gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 2.0.0 gemfile: gemfiles/Gemfile.rails-4.2 + - rvm: 2.0.0 + gemfile: gemfiles/Gemfile.rails-5.0 + - rvm: 2.1.0 gemfile: gemfiles/Gemfile.rails-3.X - rvm: 2.1.0 gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 2.1.0 gemfile: gemfiles/Gemfile.rails-4.2 + - rvm: 2.1.0 + gemfile: gemfiles/Gemfile.rails-5.0 + + - rvm: 2.2.2 + gemfile: gemfiles/Gemfile.rails-3.X + - rvm: 2.2.2 + gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 2.2.2 gemfile: gemfiles/Gemfile.rails-4.2 + - rvm: 2.2.2 + gemfile: gemfiles/Gemfile.rails-5.0 + - rvm: 2.3.0 gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 2.3.0 gemfile: gemfiles/Gemfile.rails-4.2 + - rvm: 2.3.0 + gemfile: gemfiles/Gemfile.rails-5.0 fast_finish: true allow_failures: diff --git a/bin/run_tests.sh b/bin/run_tests.sh index 7fe9dd4..cd22517 100755 --- a/bin/run_tests.sh +++ b/bin/run_tests.sh @@ -1,15 +1,8 @@ #!/bin/sh -echo "Testing active_record 3.X:" -rm -f Gemfile.lock; -BUNDLE_GEMFILE=gemfiles/Gemfile.rails-3.X bundle > /dev/null; -BUNDLE_GEMFILE=gemfiles/Gemfile.rails-3.X bundle exec rake -echo "Testing active_record 4.0:" -rm -f Gemfile.lock; -BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.0 bundle > /dev/null; -BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.0 bundle exec rake - -echo "Testing active_record 4.2:" -rm -f Gemfile.lock; -BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.2 bundle > /dev/null; -BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.2 bundle exec rake +for i in 3.X 4.0 4.2 5.0; do + echo "Testing active_record $i:" + rm -f Gemfile.lock; + BUNDLE_GEMFILE=gemfiles/Gemfile.rails-$i bundle > /dev/null; + BUNDLE_GEMFILE=gemfiles/Gemfile.rails-$i bundle exec rake +done \ No newline at end of file diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0 new file mode 100644 index 0000000..c16d545 --- /dev/null +++ b/gemfiles/Gemfile.rails-5.0 @@ -0,0 +1,8 @@ +source "https://rubygems.org" +gemspec path: '..' + +gem 'rake', '< 11.0' +gem 'actionpack', '~> 5.0.0' +gem 'railties', '~> 5.0.0' +gem 'activerecord', '~> 5.0.0' +gem 'simplecov', :require => false, :group => :test \ No newline at end of file From f54da404d8d037153a013b9c7415103093e890e0 Mon Sep 17 00:00:00 2001 From: ian douglas Date: Mon, 26 Dec 2016 14:18:10 -0700 Subject: [PATCH 2/2] testing rails 5 on travis --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e06ff4..77e9e40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,6 @@ matrix: gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 1.9.3 gemfile: gemfiles/Gemfile.rails-4.2 - - rvm: 1.9.3 - gemfile: gemfiles/Gemfile.rails-5.0 - rvm: 2.0.0 gemfile: gemfiles/Gemfile.rails-3.X @@ -18,8 +16,6 @@ matrix: gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 2.0.0 gemfile: gemfiles/Gemfile.rails-4.2 - - rvm: 2.0.0 - gemfile: gemfiles/Gemfile.rails-5.0 - rvm: 2.1.0 gemfile: gemfiles/Gemfile.rails-3.X @@ -27,8 +23,6 @@ matrix: gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 2.1.0 gemfile: gemfiles/Gemfile.rails-4.2 - - rvm: 2.1.0 - gemfile: gemfiles/Gemfile.rails-5.0 - rvm: 2.2.2 gemfile: gemfiles/Gemfile.rails-3.X @@ -39,6 +33,8 @@ matrix: - rvm: 2.2.2 gemfile: gemfiles/Gemfile.rails-5.0 + - rvm: 2.3.0 + gemfile: gemfiles/Gemfile.rails-3.X - rvm: 2.3.0 gemfile: gemfiles/Gemfile.rails-4.0 - rvm: 2.3.0