aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-02-24 13:47:54 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-02-24 13:50:29 +0100
commitfd3fd481a66478931be6800127d8473621aba272 (patch)
tree015e6648b8ac07dbb9529d094af1ab7f52659402
parent744746135254b3fe712d41e3a9b125cf50002a34 (diff)
downloadwallabag-fd3fd481a66478931be6800127d8473621aba272.tar.gz
wallabag-fd3fd481a66478931be6800127d8473621aba272.tar.zst
wallabag-fd3fd481a66478931be6800127d8473621aba272.zip
Exclude v1 branches from Travis
Instead of allowing only v2. Branches which didn't target v2 BUT related to v2 weren't tested on Travis
-rw-r--r--.travis.yml6
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
37branches: 38branches:
38 only: 39 except:
39 - v2 40 - master
41 - dev
40 42
41before_script: 43before_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;