diff options
| author | Derky <derky@phpbb.com> | 2018-01-06 00:09:02 +0100 |
|---|---|---|
| committer | Derky <derky@phpbb.com> | 2018-01-06 00:09:02 +0100 |
| commit | 90e440855ec5094f5f3f3d196d44c1a059cd2606 (patch) | |
| tree | 6e12b6b4bb6157877c12a37f212d1c73b238170e | |
| parent | 182a96f2738316adcb292816a9ac8af0e0cb5866 (diff) | |
| download | forums-90e440855ec5094f5f3f3d196d44c1a059cd2606.tar forums-90e440855ec5094f5f3f3d196d44c1a059cd2606.tar.gz forums-90e440855ec5094f5f3f3d196d44c1a059cd2606.tar.bz2 forums-90e440855ec5094f5f3f3d196d44c1a059cd2606.tar.xz forums-90e440855ec5094f5f3f3d196d44c1a059cd2606.zip | |
[ticket/15499] Remove HHVM from Travis build matrix
PHPBB3-15499
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | travis/setup-phpbb.sh | 2 | ||||
| -rwxr-xr-x | travis/setup-webserver.sh | 53 |
3 files changed, 21 insertions, 37 deletions
diff --git a/.travis.yml b/.travis.yml index db3e4311c5..91b8b4932c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,7 @@ matrix: env: DB=mysqli - php: nightly env: DB=mysqli - - php: hhvm - env: DB=mysqli allow_failures: - - php: hhvm - php: nightly fast_finish: true diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index f9fd9522ca..be9eb703d5 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -26,7 +26,7 @@ then travis/setup-mariadb.sh fi -if [ "$NOTESTS" != '1' -a "$TRAVIS_PHP_VERSION" != "hhvm" ] +if [ "$NOTESTS" != '1' ] then travis/setup-php-extensions.sh fi diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 3369d740fe..7fb67e0454 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -22,39 +22,26 @@ PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB") NGINX_CONF="/etc/nginx/sites-enabled/default" APP_SOCK=$(realpath "$DIR")/php-app.sock -if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] -then - HHVM_LOG=$(realpath "$DIR")/hhvm.log - - sudo service hhvm stop - sudo hhvm \ - --mode daemon \ - --user "$USER" \ - -vServer.Type=fastcgi \ - -vServer.FileSocket="$APP_SOCK" \ - -vLog.File="$HHVM_LOG" -else - # php-fpm - PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" - PHP_FPM_CONF="$DIR/php-fpm.conf" - - echo " - [global] - - [travis] - user = $USER - group = $USER - listen = $APP_SOCK - listen.mode = 0666 - pm = static - pm.max_children = 2 - - php_admin_value[memory_limit] = 128M - " > $PHP_FPM_CONF - - sudo $PHP_FPM_BIN \ - --fpm-config "$DIR/php-fpm.conf" -fi +# php-fpm +PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" +PHP_FPM_CONF="$DIR/php-fpm.conf" + +echo " + [global] + + [travis] + user = $USER + group = $USER + listen = $APP_SOCK + listen.mode = 0666 + pm = static + pm.max_children = 2 + + php_admin_value[memory_limit] = 128M +" > $PHP_FPM_CONF + +sudo $PHP_FPM_BIN \ + --fpm-config "$DIR/php-fpm.conf" # nginx cat $DIR/../phpBB/docs/nginx.sample.conf \ |