Merge pull request #4438 from wallabag/dependabot/composer/scheb/two-factor-bundle...

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

diff --git a/.travis.yml b/.travis.yml
index 8c1ec5cb3d8ef2581701615943e3d739743175bb..06963df93b31bb8b50fa23ad8c848bc74578f452 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
+os: linux
+dist: xenial
 language: php
 
 services:
+    - mysql
+    - postgresql
     - rabbitmq
     - redis
 
@@ -8,17 +12,20 @@ services:
 cache:
     apt: true
     directories:
-        - vendor
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
         - node_modules
         - $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"
@@ -28,13 +35,11 @@ env:
     - DB=pgsql
     - DB=sqlite
 
-matrix:
+jobs:
     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
 
 # exclude v1 branches
 branches:
@@ -43,13 +48,6 @@ branches:
 
 before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
-
-install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
-    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
-    - if [[ $ASSETS = build ]]; then yarn install; fi;
-
-before_script:
     - PHP=$TRAVIS_PHP_VERSION
     - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - phpenv config-rm xdebug.ini || echo "xdebug not available"
@@ -59,16 +57,19 @@ before_script:
     - pecl channel-update pecl.php.net
     - yes | pecl install imagick
 
-script:
-    - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
+install:
+    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
+    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
+    - if [[ $ASSETS = build ]]; then yarn install; fi;
+    - composer install -o --no-interaction --no-progress --prefer-dist --no-suggest
+    - php bin/simple-phpunit install
 
-    - echo "travis_fold:start:prepare"
+before_script:
     - make prepare DB=$DB
-    - echo "travis_fold:end:prepare"
-
     - make fixtures
 
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then SYMFONY_PHPUNIT_VERSION=6.5 ./bin/simple-phpunit -v ; fi;
+script:
+    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
     # PHPStan needs PHPUnit to be installed and cache app to be generated
     - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then php bin/phpstan analyse src tests --no-progress --level 1 ; fi;
     - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;