diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-19 06:01:07 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-19 06:01:07 +0000 |
| commit | 33aaa06fe94e4db8f596cf1fb42b56d204b8a353 (patch) | |
| tree | 43dc8f578ea26a05ecd1c3adbeb22055c54709b8 | |
| parent | 92b7b831cb4b354951b44ff7b62f9457817c06b4 (diff) | |
| download | redmine-33aaa06fe94e4db8f596cf1fb42b56d204b8a353.tar.gz redmine-33aaa06fe94e4db8f596cf1fb42b56d204b8a353.zip | |
Merged r14132 from trunk to 3.0-stable
.travis.yml: replace TEST_SUITE to SUITE
Prevent travis UI confusion.
https://github.com/travis-ci/travis-ci/issues/3386
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14133 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | .travis.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 013171bd0..822fa0b5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,18 @@ rvm: - 2.2 - jruby env: - - "TEST_SUITE=units DATABASE_ADAPTER=postgresql" - - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql" - - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql" - - "TEST_SUITE=ui DATABASE_ADAPTER=postgresql" - - "TEST_SUITE=units DATABASE_ADAPTER=mysql" - - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql" - - "TEST_SUITE=integration DATABASE_ADAPTER=mysql" - - "TEST_SUITE=ui DATABASE_ADAPTER=mysql" - - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3" - - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3" - - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3" - - "TEST_SUITE=ui DATABASE_ADAPTER=sqlite3" + - "SUITE=units DATABASE_ADAPTER=postgresql" + - "SUITE=functionals DATABASE_ADAPTER=postgresql" + - "SUITE=integration DATABASE_ADAPTER=postgresql" + - "SUITE=ui DATABASE_ADAPTER=postgresql" + - "SUITE=units DATABASE_ADAPTER=mysql" + - "SUITE=functionals DATABASE_ADAPTER=mysql" + - "SUITE=integration DATABASE_ADAPTER=mysql" + - "SUITE=ui DATABASE_ADAPTER=mysql" + - "SUITE=units DATABASE_ADAPTER=sqlite3" + - "SUITE=functionals DATABASE_ADAPTER=sqlite3" + - "SUITE=integration DATABASE_ADAPTER=sqlite3" + - "SUITE=ui DATABASE_ADAPTER=sqlite3" matrix: allow_failures: # SCM tests fail randomly due to IO.popen(). @@ -39,6 +39,6 @@ script: - "bundle install" - "bundle exec rake ci:setup" - phantomjs --webdriver 4444 & - - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE} + - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${SUITE} notifications: email: false |