From fab9f684af8784470e4c057ebe46dc5931b69c30 Mon Sep 17 00:00:00 2001 From: marc tobias Date: Wed, 17 Apr 2019 14:03:35 +0200 Subject: [PATCH] travis-CI: use PHP 7.1 --- .travis.yml | 4 +++- vagrant/install-on-travis-ci.sh | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe4e0cbd..259b9d5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ git: env: - TEST_SUITE=tests - TEST_SUITE=monaco +before_install: + - phpenv global 7.1 install: - vagrant/install-on-travis-ci.sh before_script: @@ -19,7 +21,7 @@ script: - cd $TRAVIS_BUILD_DIR/ - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi - cd $TRAVIS_BUILD_DIR/test/php - - if [[ $TEST_SUITE == "tests" ]]; then phpunit ./ ; fi + - if [[ $TEST_SUITE == "tests" ]]; then /usr/bin/phpunit ./ ; fi - cd $TRAVIS_BUILD_DIR/test/bdd - # behave --format=progress3 api - if [[ $TEST_SUITE == "tests" ]]; then behave -DREMOVE_TEMPLATE=1 --format=progress3 db ; fi diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh index fa2a43e0..229a7ef1 100755 --- a/vagrant/install-on-travis-ci.sh +++ b/vagrant/install-on-travis-ci.sh @@ -26,6 +26,9 @@ pip3 install --quiet behave nose pytidylib psycopg2-binary composer global require "squizlabs/php_codesniffer=*" sudo ln -s /home/travis/.config/composer/vendor/bin/phpcs /usr/bin/ +composer global require "phpunit/phpunit=7.*" +sudo ln -s /home/travis/.config/composer/vendor/bin/phpunit /usr/bin/ + sudo -u postgres createuser -S www-data # Make sure that system servers can read from the home directory: -- 2.43.2