Skip to content

Commit 5f4918a

Browse files
Merge branch '4.1'
* 4.1: [travis] test with latest PHP 7.1 to hopefully get rid of segfaults
2 parents a5516fc + 613ca3c commit 5f4918a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222

2323
matrix:
2424
include:
25-
- php: 7.1.3
25+
- php: 7.1
2626
- php: 7.1
2727
env: deps=high
2828
- php: 7.2
@@ -113,7 +113,7 @@ before_install:
113113
114114
- |
115115
# Install sigchild-enabled PHP to test the Process component on the lowest PHP matrix line
116-
if [[ ! $deps && $TRAVIS_PHP_VERSION = $MIN_PHP && ! -d php-$MIN_PHP/sapi ]]; then
116+
if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then
117117
wget http://php.net/get/php-$MIN_PHP.tar.bz2/from/this/mirror -O - | tar -xj &&
118118
(cd php-$MIN_PHP && ./configure --enable-sigchild --enable-pcntl && make -j2)
119119
fi
@@ -216,7 +216,8 @@ install:
216216
else
217217
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
218218
tfold src/Symfony/Component/Console.tty $PHPUNIT src/Symfony/Component/Console --group tty
219-
if [[ $PHP = $MIN_PHP ]]; then
219+
if [[ $PHP = ${MIN_PHP%.*} ]]; then
220+
export PHP=$MIN_PHP
220221
tfold src/Symfony/Component/Process.sigchild SYMFONY_DEPRECATIONS_HELPER=weak php-$MIN_PHP/sapi/cli/php ./phpunit --colors=always src/Symfony/Component/Process/
221222
fi
222223
fi

0 commit comments

Comments
 (0)