Fix documentation wording for matches/notmatches tagging rules

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

diff --git a/.travis.yml b/.travis.yml
index 7468b1162bf444533a2bac0324ba213a4c07c4e9..c6c03dc3fce35b70ed498f93b7e0a1127f9693ad 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,13 @@ services:
   - redis
 
 # faster builds on docker-container setup
-sudo: required
+sudo: false
 
 # used for HHVM
 addons:
   apt:
     packages:
       - tidy
-  postgresql: 9.5
 
 # cache vendor dirs
 cache:
@@ -21,14 +20,14 @@ cache:
         - vendor
         - $HOME/.composer/cache
         - node_modules
-        - $HOME/.cache/bower
         - $HOME/.npm
+        - $HOME/.yarn-cache
 
 php:
-    - 5.5
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
     - nightly
 
 node_js:
@@ -45,7 +44,7 @@ matrix:
         - php: 7.0
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
-        - php: 7.1
+        - php: 7.2
         - php: nightly
 
 # exclude v1 branches
@@ -60,22 +59,28 @@ before_script:
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
     - composer self-update --no-progress
     - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
-    - if [[ $DB = pgsql ]]; then psql -U postgres wallabag_test -c 'create extension "uuid-ossp";'; fi;
 
 install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi;
-    - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
-    - if [[ $ASSETS = build ]]; then npm install; fi;
+    - 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_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
     - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
-    - ant prepare-$DB
+    - echo "travis_fold:start:prepare"
+    - make prepare DB=$DB
+    - echo "travis_fold:end:prepare"
+
+    - echo "travis_fold:start:fixtures"
+    - php bin/console doctrine:fixtures:load --no-interaction --env=test
+    - echo "travis_fold:end:fixtures"
+
     - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
-    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
+    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
-    - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; fi;
+    - if [[ $ASSETS = build ]]; then yarn run build:prod; fi;