diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-02-29 17:19:39 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-02-29 17:19:39 +0100 |
| commit | 1e18360cc7d6b7987bffc4ecd067d0b3aee85bb1 (patch) | |
| tree | 7dfecfbf46240e0c2db13a1ee8c2f5b927676530 /.travis.yml | |
| parent | 30e5174ea779059a0021d3c4e56f09ade94cbd83 (diff) | |
| parent | 3c39f5ac413cc1bd58a0647fcbb52982af81c078 (diff) | |
| download | wallabag-1e18360cc7d6b7987bffc4ecd067d0b3aee85bb1.tar.gz wallabag-1e18360cc7d6b7987bffc4ecd067d0b3aee85bb1.tar.zst wallabag-1e18360cc7d6b7987bffc4ecd067d0b3aee85bb1.zip | |
Merge pull request #1734 from wallabag/v2-todo
Remove extra definition
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c6d371a5..5f0abe87 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -44,8 +44,7 @@ before_script: | |||
| 44 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; | 44 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; |
| 45 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; | 45 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; |
| 46 | - composer self-update --no-progress | 46 | - composer self-update --no-progress |
| 47 | - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; | 47 | - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; |
| 48 | - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; | ||
| 49 | 48 | ||
| 50 | before_install: | 49 | before_install: |
| 51 | - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; | 50 | - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; |