From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 9 Sep 2016 19:30:13 +0000 (+0200)
Subject: Check if asset is enable instead of opposite
X-Git-Tag: 2.1.0~39^2~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=40c47f7023577d410818569b3be953c4aa2604cc;p=github%2Fwallabag%2Fwallabag.git

Check if asset is enable instead of opposite

Instead of defining ASSETS all the time, just define it when we want to
use it
Might give us more clearer build
---

diff --git a/.travis.yml b/.travis.yml
index c343d5ae..749b8ef7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,9 @@ node_js:
     - "5"
 
 env:
-    - DB=mysql ASSETS=nobuild
-    - DB=pgsql ASSETS=nobuild
-    - DB=sqlite ASSETS=nobuild
+    - DB=mysql
+    - DB=pgsql
+    - DB=sqlite
 
 matrix:
     fast_finish: true
@@ -57,7 +57,7 @@ matrix:
           group: edge
           env: DB=sqlite
         - php: 7.0
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
         - php: 7.0
           env: DB=sqlite ASSETS=build
     allow_failures:
@@ -77,11 +77,11 @@ before_script:
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
     - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
     - composer self-update --no-progress
-    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
+    - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
 
 install:
-    - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
-    - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi;
+    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
+    - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
 
 before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
@@ -90,5 +90,5 @@ script:
     - travis_wait bash install.sh
     - ant prepare-$DB
     - phpunit -v
-    - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
-    - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
+    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;