diff options
| author | Kevin Decherf <kevin@kdecherf.com> | 2019-01-30 01:02:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 01:02:27 +0100 |
| commit | 2e5b3fa361098498a9e42a65396a27e1eb487fba (patch) | |
| tree | f20677c3d68c1ea756f0835ff179a0d7d3431a67 /.travis.yml | |
| parent | c6024246b744e411175318065f7c396bbb5a213e (diff) | |
| parent | 4654a83b6438b88e3b7062a21d18999d9df2fb8e (diff) | |
| download | wallabag-2e5b3fa361098498a9e42a65396a27e1eb487fba.tar.gz wallabag-2e5b3fa361098498a9e42a65396a27e1eb487fba.tar.zst wallabag-2e5b3fa361098498a9e42a65396a27e1eb487fba.zip | |
Merge pull request #3798 from wallabag/update-two-factor-bundle
Enable OTP 2FA
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 0ca1e192..393d0033 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -51,13 +51,13 @@ install: | |||
| 51 | 51 | ||
| 52 | before_script: | 52 | before_script: |
| 53 | - PHP=$TRAVIS_PHP_VERSION | 53 | - PHP=$TRAVIS_PHP_VERSION |
| 54 | - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; | 54 | - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini |
| 55 | # xdebug isn't enable for PHP 7.1 | 55 | - phpenv config-rm xdebug.ini || echo "xdebug not available" |
| 56 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi | ||
| 57 | - composer self-update --no-progress | 56 | - composer self-update --no-progress |
| 58 | 57 | ||
| 59 | script: | 58 | script: |
| 60 | - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist | 59 | - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist |
| 60 | |||
| 61 | - echo "travis_fold:start:prepare" | 61 | - echo "travis_fold:start:prepare" |
| 62 | - make prepare DB=$DB | 62 | - make prepare DB=$DB |
| 63 | - echo "travis_fold:end:prepare" | 63 | - echo "travis_fold:end:prepare" |