fix travis build matrix to support 7.x and hhvm

This commit is contained in:
Rob Frawley 2nd
2016-12-18 11:50:38 -05:00
committed by Fabien Potencier
parent 9eeaa699ca
commit 12e75458bc
2 changed files with 27 additions and 26 deletions
+25 -24
View File
@@ -3,36 +3,37 @@ language: php
sudo: false sudo: false
cache: cache:
directories: directories:
- vendor - vendor
- $HOME/.composer/cache/files - $HOME/.composer/cache/files
php: matrix:
- 5.6 include:
- 7.0 - php: hhvm-stable
- 7.1 sudo: required
- hhvm dist: trusty
group: edge
env: env: TWIG_EXT=no
- TWIG_EXT=no - php: 7.0
- TWIG_EXT=yes env: TWIG_EXT=no
- php: 7.1
env: TWIG_EXT=no
allow_failures:
- php: hhvm-stable
sudo: required
dist: trusty
group: edge
env: TWIG_EXT=no
fast_finish: true
before_install: before_install:
- if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
- if [[ $TRAVIS_PHP_VERSION = hhvm* ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
install: install:
- travis_retry composer install - travis_retry composer install
before_script: before_script:
- if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
- if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
matrix:
fast_finish: true
exclude:
- php: hhvm
env: TWIG_EXT=yes
- php: 7.0
env: TWIG_EXT=yes
- php: 7.1
env: TWIG_EXT=yes
+2 -2
View File
@@ -27,7 +27,7 @@
"forum": "https://groups.google.com/forum/#!forum/twig-users" "forum": "https://groups.google.com/forum/#!forum/twig-users"
}, },
"require": { "require": {
"php": "^5.6|^7.0", "php": "^7.0",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-mbstring": "~1.0"
}, },
"require-dev": { "require-dev": {
@@ -50,4 +50,4 @@
} }
}, },
"minimum-stability": "dev" "minimum-stability": "dev"
} }