diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-18 09:46:32 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-18 09:46:32 +0200 |
| commit | b176b86f111a05338ed3c74026bcf19d42ec0ee3 (patch) | |
| tree | 84688d2ce5bee1ff77e87565d3d45f27136312ad | |
| parent | a3757763ac32be8261aab6e92b696e733e995c59 (diff) | |
| parent | eeef82ecc585caab1298f3559ccb8f615a89e706 (diff) | |
| download | forums-b176b86f111a05338ed3c74026bcf19d42ec0ee3.tar forums-b176b86f111a05338ed3c74026bcf19d42ec0ee3.tar.gz forums-b176b86f111a05338ed3c74026bcf19d42ec0ee3.tar.bz2 forums-b176b86f111a05338ed3c74026bcf19d42ec0ee3.tar.xz forums-b176b86f111a05338ed3c74026bcf19d42ec0ee3.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 20c0c6bf4f..e2bedef32b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ env: - DB=postgres before_script: - - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" + - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" + - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" - pyrus install --force phpunit/DbUnit - phpenv rehash |