update travis and circleci conf

This commit is contained in:
Florian BLOUET
2016-03-18 12:36:38 +01:00
parent 753f9b3abd
commit c9b21d87f1
2 changed files with 3 additions and 2 deletions

View File

@@ -59,6 +59,7 @@ before_script:
- "./bin/developer phraseanet:generate-js-fixtures"
script:
- "./node_modules/.bin/gulp test"
- |
echo "$TEST_SUITE";
case "$TEST_SUITE" in

View File

@@ -9,7 +9,7 @@ machine:
php:
version: 5.5.21
node:
version: 0.12.0
version: stable
services:
- memcached
- redis
@@ -46,5 +46,5 @@ database:
test:
override:
- case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; ./node_modules/.bin/gulp test || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac:
- case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac:
parallel: true