diff options
| author | Uwe Tews <uwe.tews@googlemail.com> | 2017-10-09 16:45:24 +0200 |
|---|---|---|
| committer | Uwe Tews <uwe.tews@googlemail.com> | 2017-10-09 17:04:03 +0200 |
| commit | 157f51086cbf4fccab97bcb2689664d441738497 (patch) | |
| tree | 2a682344b6fe30bee84d9f22d147258eac015a2d /.travis.yml | |
| parent | 7e84d34363b7f83aab86b51760f7071d335b6509 (diff) | |
| download | smarty-157f51086cbf4fccab97bcb2689664d441738497.tar.gz smarty-157f51086cbf4fccab97bcb2689664d441738497.tar.bz2 smarty-157f51086cbf4fccab97bcb2689664d441738497.zip | |
Test phpunit 6.4.1 (reverted from commit f60d8a763c956080ffe171398a45873dd0fa702f)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index dd90c336..b6726ff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,16 @@ install: script: - cd smarty-phpunit +<<<<<<< HEAD + - if [[ $TRAVIS_PHP_VERSION = 7.* || $TRAVIS_PHP_VERSION = nightly ]]; then + ./vendor/bin/phpunit + else + phpunit ./ +======= - if [[ $TRAVIS_PHP_VERSION = 7.1 || $TRAVIS_PHP_VERSION = nightly ]]; then $COMPOSER_BIN_DIR/phpunit ./; else phpunit ./; +>>>>>>> parent of e9e97cc... Use phpunit 6.4.1 for PHP 7.1 fi |