X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=c6d371a50e3637bf4911c8894e7e6714211557d3;hb=30e5174ea779059a0021d3c4e56f09ade94cbd83;hp=9ae43639743a7b8b971d4b798d62083eb0907557;hpb=3ee1582e60cbebb70f6e4b932e337a59a8517580;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index 9ae43639..c6d371a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,9 +34,11 @@ matrix:
     allow_failures:
         - php: hhvm
 
+# exclude v1 branches
 branches:
-    only:
-        - v2
+    except:
+        - master
+        - dev
 
 before_script:
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
@@ -45,6 +47,9 @@ before_script:
     - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
     - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
 
+before_install:
+    - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
+
 script:
     - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB