diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /.travis.yml | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 2ac840bc1..3abeb225f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ # You can also run tests on your environment. language: ruby rvm: - - 1.8.7 - - 1.9.2 - 1.9.3 - 2.0 - 2.1 @@ -34,6 +32,7 @@ script: - "bundle install" - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml" - "bundle install" - - "JRUBY_OPTS=-J-Xmx1024m bundle exec rake ci" + - "bundle exec rake ci:setup" + - "sh .travis.run-test.sh" notifications: email: false |