diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-24 14:47:35 +0100 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-24 14:47:35 +0100 |
| commit | f83125d2f5cea2c850b7f31ef1ad0a50c6fefdd9 (patch) | |
| tree | c8352e3e576ba849a6ea01940b64861bc97bd8ff /.travis.yml | |
| parent | d7cc16c8b585f6a600cd309a9bb5630794fcf9aa (diff) | |
| parent | 7af794e525fd0d7504d0a1c41cc747909df66033 (diff) | |
| download | wallabag-f83125d2f5cea2c850b7f31ef1ad0a50c6fefdd9.tar.gz wallabag-f83125d2f5cea2c850b7f31ef1ad0a50c6fefdd9.tar.zst wallabag-f83125d2f5cea2c850b7f31ef1ad0a50c6fefdd9.zip | |
Merge pull request #1716 from wallabag/v2-enhance-requirements-installation
Fix #1603: Enhance requirements in InstallCommand
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9ae43639..819d29fd 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -34,9 +34,11 @@ matrix: | |||
| 34 | allow_failures: | 34 | allow_failures: |
| 35 | - php: hhvm | 35 | - php: hhvm |
| 36 | 36 | ||
| 37 | # exclude v1 branches | ||
| 37 | branches: | 38 | branches: |
| 38 | only: | 39 | except: |
| 39 | - v2 | 40 | - master |
| 41 | - dev | ||
| 40 | 42 | ||
| 41 | before_script: | 43 | before_script: |
| 42 | - 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; |