diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-04-14 06:54:01 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-04-14 06:54:01 +0000 |
| commit | 9c9419eadc38c5af7b05a8e01692270b1dd36a0c (patch) | |
| tree | b0136efac80d25aec1595935acf8e0d1d5e7f9fd | |
| parent | 40e599f31b0d56abcf42f401dd1a2659d4398879 (diff) | |
| download | redmine-9c9419eadc38c5af7b05a8e01692270b1dd36a0c.tar.gz redmine-9c9419eadc38c5af7b05a8e01692270b1dd36a0c.zip | |
Merged r14172 from trunk to 3.0-stable
.travis.yml: replace DATABASE_ADAPTER to DB
Prevent travis UI confusion.
* https://github.com/travis-ci/travis-ci/issues/3386
* https://github.com/travis-ci/travis-ci/issues/3402
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14173 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 822fa0b5f..7622d839e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,18 @@ rvm: - 2.2 - jruby env: - - "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" + - "SUITE=units DB=postgresql" + - "SUITE=functionals DB=postgresql" + - "SUITE=integration DB=postgresql" + - "SUITE=ui DB=postgresql" + - "SUITE=units DB=mysql" + - "SUITE=functionals DB=mysql" + - "SUITE=integration DB=mysql" + - "SUITE=ui DB=mysql" + - "SUITE=units DB=sqlite3" + - "SUITE=functionals DB=sqlite3" + - "SUITE=integration DB=sqlite3" + - "SUITE=ui DB=sqlite3" matrix: allow_failures: # SCM tests fail randomly due to IO.popen(). @@ -31,6 +31,7 @@ before_install: - "sudo apt-get update -qq" - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion" script: + - export DATABASE_ADAPTER=${DB} - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem" - "export SCMS" - "git --version" |