mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 08:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Check if asset is enable instead of opposite

Browse source 
Instead of defining ASSETS all the time, just define it when we want to
use it
Might give us more clearer build
This commit is contained in:
Jeremy Benoist 2016-09-09 21:30:13 +02:00
parent c078d18372
commit 40c47f7023
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.travis.yml
View file

@ -30,9 +30,9 @@ node_js:
- "5" - "5"
env: env:
- DB=mysql ASSETS=nobuild - DB=mysql
- DB=pgsql ASSETS=nobuild - DB=pgsql
- DB=sqlite ASSETS=nobuild - DB=sqlite
matrix: matrix:
fast_finish: true fast_finish: true
@ -57,7 +57,7 @@ matrix:
group: edge group: edge
env: DB=sqlite env: DB=sqlite
- php: 7.0 - 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 - php: 7.0
env: DB=sqlite ASSETS=build env: DB=sqlite ASSETS=build
allow_failures: allow_failures:
@ -77,11 +77,11 @@ before_script:
- if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi - 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; - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
- composer self-update --no-progress - 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: install:
- if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
- if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi; - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
before_install: before_install:
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; - 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 - travis_wait bash install.sh
- ant prepare-$DB - ant prepare-$DB
- phpunit -v - phpunit -v
- 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 src/ --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 src/Wallabag/CoreBundle/Resources/translations -v ; fi;