diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2016-04-18 22:12:52 +0200 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2016-04-18 22:12:52 +0200 |
| commit | 23feba63bb22c240f22243738b1157f88041948a (patch) | |
| tree | cce9c32fa6db41f30a78de2efad12ef7757801e1 /.travis.yml | |
| parent | 0907a72c6477cbe0f25a25563a9c37c43a28d5ad (diff) | |
| parent | 3320d394187e5f5177536eb76859cbdcef297d85 (diff) | |
| download | wallabag-23feba63bb22c240f22243738b1157f88041948a.tar.gz wallabag-23feba63bb22c240f22243738b1157f88041948a.tar.zst wallabag-23feba63bb22c240f22243738b1157f88041948a.zip | |
Merge pull request #1944 from wallabag/travis-rename-branches
Update Travis configuration with branches renaming
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 324b236a..d397c872 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -41,8 +41,7 @@ matrix: | |||
| 41 | # exclude v1 branches | 41 | # exclude v1 branches |
| 42 | branches: | 42 | branches: |
| 43 | except: | 43 | except: |
| 44 | - master | 44 | - legacy |
| 45 | - dev | ||
| 46 | 45 | ||
| 47 | before_script: | 46 | before_script: |
| 48 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; | 47 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; |