Merge pull request #4354 from wallabag/dependabot/composer/doctrine/doctrine-bundle...

[github/wallabag/wallabag.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index bd21d6c7434c5762cab8e4b1441e3341e2dfca99..c09bcd22a50190e251fee6e4cf080be8c23acc6b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,15 @@ cache:
         - $HOME/.npm
         - $HOME/.yarn-cache
 
+if: |
+    type = pull_request OR \
+    branch = master
+
 php:
     - 7.1
     - 7.2
     - 7.3
-    - nightly
+    - 7.4
 
 node_js:
     - "5"
@@ -33,10 +37,10 @@ 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: nightly
+        - php: 7.4
 
 # exclude v1 branches
 branches: