diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-07-26 20:19:58 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-07-26 20:19:58 +0200 |
| commit | 12117be8293eff1a56b575ccc2e5d11c68c8cfcf (patch) | |
| tree | 87adfc30fc2bbdcbd43dc6b0f5058c0e921c3f65 | |
| parent | 77266bc6a01668b2106b9974da02e2a7ceaf2fe6 (diff) | |
Fix Travis builds
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 4680d2ac6..22c3b6e18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,7 @@ env: sudo: false before_script: -<<<<<<< HEAD - sh -c "composer install --dev --no-progress" -======= ->>>>>>> 3.1-stable - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi" |