X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.travis.yml;h=8adef62e614e8823a8b9454900df08c74b6a8d12;hb=eb7b632ee6f898dbe5c861623f59fa62fc4d5235;hp=229e3e0efa8b41f512d4db87cfaf9f237acf0b7c;hpb=b19df31d78d881a43bcf6b3215e5fc3781e8e8aa;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.travis.yml b/.travis.yml
index 229e3e0e..8adef62e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,15 @@ cache:
         - $HOME/.npm
         - $HOME/.yarn-cache
 
+if: |
+    type = pull_request OR \
+    branch = master
+
 php:
     - 7.1
     - 7.2
     - 7.3
     - 7.4
-    - nightly
 
 node_js:
     - "5"
@@ -34,11 +37,8 @@ env:
 matrix:
     fast_finish: true
     include:
-        - php: 7.2
+        - php: 7.3
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
-    allow_failures:
-        - php: 7.4
-        - php: nightly
 
 # exclude v1 branches
 branches: