@@ -53,18 +53,18 @@ before_install:
53
53
[ -d ~/.composer ] || mkdir ~/.composer
54
54
cp .composer/* ~/.composer/
55
55
export PHPUNIT=$(readlink -f ./phpunit)
56
- export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
56
+ export PHPUNIT_X="$PHPUNIT --stop-on-failure -- exclude-group tty,benchmark,intl-data"
57
57
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
58
58
59
59
# tfold is a helper to create folded reports
60
60
tfold () {
61
61
title=$1
62
62
fold=$(echo $title | sed -r 's/[^-_A-Za-z\d]+/./g')
63
63
shift
64
- echo -e "travis_fold:start:$fold\\n\\e[1;34m$title\\e[0m"
64
+ echo -e "travis_fold:start:$fold\\n\\e[1;34m$title\\e[0m$(date) "
65
65
bash -xc "$*" 2>&1 &&
66
- echo -e "\\e[32mOK\\e[0m $title\\n\\ntravis_fold:end:$fold" ||
67
- ( echo -e "\\e[41mKO\\e[0m $title\\n" && exit 1 )
66
+ echo -e "\\e[32mOK $(date) \\e[0m $title\\n\\ntravis_fold:end:$fold" ||
67
+ ( echo -e "\\e[41mKO $(date) \\e[0m $title\\n" && exit 1 )
68
68
}
69
69
export -f tfold
70
70
@@ -92,12 +92,9 @@ before_install:
92
92
fi
93
93
94
94
# Matrix lines for intermediate PHP versions are skipped for pull requests
95
- if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
96
- deps=skip
97
- skip=1
98
- else
99
- COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n')
100
- fi
95
+ # COMPONENTS=$(printf 'src/Symfony/Bridge/Doctrine\nsrc/Symfony/Bundle/FrameworkBundle\nsrc/Symfony/Component/Cache\nsrc/Symfony/Component/HttpFoundation\nsrc/Symfony/Component/Lock\n')
96
+ # COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'|grep Lock)
97
+ COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n')
101
98
102
99
- |
103
100
# Install sigchild-enabled PHP to test the Process component on the lowest PHP matrix line
@@ -170,16 +167,16 @@ install:
170
167
if [[ $skip ]]; then
171
168
echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
172
169
elif [[ $deps = high ]]; then
173
- echo "$COMPONENTS" | parallel --gnu -j10 % "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
170
+ echo "$COMPONENTS" | parallel --gnu -j5 % "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
174
171
elif [[ $deps = low ]]; then
175
- echo "$COMPONENTS" | parallel --gnu -j10 % "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'" &&
172
+ echo "$COMPONENTS" | parallel --gnu -j5 % "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'" &&
176
173
# Test the PhpUnit bridge on PHP 5.3, using the original phpunit script
177
174
tfold src/Symfony/Bridge/PhpUnit \
178
175
"cd src/Symfony/Bridge/PhpUnit && wget https://phar.phpunit.de/phpunit-4.8.phar && phpenv global 5.3 && composer update --no-progress --ansi && php phpunit-4.8.phar"
179
176
elif [[ $PHP = hhvm* ]]; then
180
177
$PHPUNIT --exclude-group benchmark,intl-data
181
178
else
182
- echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
179
+ echo "$COMPONENTS" | parallel --gnu -j5% "tfold {} $PHPUNIT_X {}"
183
180
tfold tty-group $PHPUNIT --group tty
184
181
if [[ $PHP = ${MIN_PHP%.*} ]]; then
185
182
echo -e "1\\n0" | xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} SYMFONY_DEPRECATIONS_HELPER=weak ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/"
0 commit comments