aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-03-28 14:07:42 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-03-28 14:07:42 +0200
commit7d1d961267c129e2110ce9cc14c5a9d0a7d255cb (patch)
treed260d7b4ffc8466d7d410ec61bd896bdadd8456e /.travis.yml
parente1cc8fd79921fdff9999087ba896c88b14ffc0cd (diff)
parent6ae579e43f6a4ffe607a6361191366410d19f806 (diff)
downloadwallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.gz
wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.zst
wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.zip
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 8c8093bf..77872f49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,6 @@ cache:
24 - $HOME/.npm 24 - $HOME/.npm
25 25
26php: 26php:
27 - 5.5
28 - 5.6 27 - 5.6
29 - 7.0 28 - 7.0
30 - 7.1 29 - 7.1
@@ -44,7 +43,6 @@ matrix:
44 - php: 7.0 43 - php: 7.0
45 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite 44 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
46 allow_failures: 45 allow_failures:
47 - php: 7.1
48 - php: nightly 46 - php: nightly
49 47
50# exclude v1 branches 48# exclude v1 branches