diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 1e0ee65db..4680d2ac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,10 @@ 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" @@ -41,4 +44,5 @@ branches: only: - develop - 3.0-stable + - 3.1-stable - /^feature\/.+$/ |