diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-09 21:30:13 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-09 21:30:14 +0200 |
commit | 40c47f7023577d410818569b3be953c4aa2604cc (patch) | |
tree | ade51e1de0de44bbeca7e2c6f051a0e5abcd691c | |
parent | c078d18372e05b09b40c34f67b7cb81446f30c4f (diff) | |
download | wallabag-40c47f7023577d410818569b3be953c4aa2604cc.tar.gz wallabag-40c47f7023577d410818569b3be953c4aa2604cc.tar.zst wallabag-40c47f7023577d410818569b3be953c4aa2604cc.zip |
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
-rw-r--r-- | .travis.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index c343d5ae..749b8ef7 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -30,9 +30,9 @@ node_js: | |||
30 | - "5" | 30 | - "5" |
31 | 31 | ||
32 | env: | 32 | env: |
33 | - DB=mysql ASSETS=nobuild | 33 | - DB=mysql |
34 | - DB=pgsql ASSETS=nobuild | 34 | - DB=pgsql |
35 | - DB=sqlite ASSETS=nobuild | 35 | - DB=sqlite |
36 | 36 | ||
37 | matrix: | 37 | matrix: |
38 | fast_finish: true | 38 | fast_finish: true |
@@ -57,7 +57,7 @@ matrix: | |||
57 | group: edge | 57 | group: edge |
58 | env: DB=sqlite | 58 | env: DB=sqlite |
59 | - php: 7.0 | 59 | - php: 7.0 |
60 | env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild | 60 | env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite |
61 | - php: 7.0 | 61 | - php: 7.0 |
62 | env: DB=sqlite ASSETS=build | 62 | env: DB=sqlite ASSETS=build |
63 | allow_failures: | 63 | allow_failures: |
@@ -77,11 +77,11 @@ before_script: | |||
77 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi | 77 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi |
78 | - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi; | 78 | - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi; |
79 | - composer self-update --no-progress | 79 | - composer self-update --no-progress |
80 | - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; | 80 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; |
81 | 81 | ||
82 | install: | 82 | install: |
83 | - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; | 83 | - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; |
84 | - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi; | 84 | - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; |
85 | 85 | ||
86 | before_install: | 86 | before_install: |
87 | - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; | 87 | - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; |
@@ -90,5 +90,5 @@ script: | |||
90 | - travis_wait bash install.sh | 90 | - travis_wait bash install.sh |
91 | - ant prepare-$DB | 91 | - ant prepare-$DB |
92 | - phpunit -v | 92 | - phpunit -v |
93 | - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; | 93 | - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; |
94 | - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; | 94 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; |