diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-03-30 01:43:11 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-03-30 15:43:54 +0200 |
| commit | d53c411d90700c751cf1f4980e13868752698406 (patch) | |
| tree | 57621f8eb0597cbfd817d65226236c4324121bc2 /travis | |
| parent | a53312636a02797d7856a381f580e5969b131700 (diff) | |
| download | forums-d53c411d90700c751cf1f4980e13868752698406.tar forums-d53c411d90700c751cf1f4980e13868752698406.tar.gz forums-d53c411d90700c751cf1f4980e13868752698406.tar.bz2 forums-d53c411d90700c751cf1f4980e13868752698406.tar.xz forums-d53c411d90700c751cf1f4980e13868752698406.zip | |
[ticket/12318] Always install new config file on HHVM upgrade conflict.
PHPBB3-12318
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-webserver.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 68134872f9..5bc0feae88 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -26,7 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] then # Upgrade to a recent stable version of HHVM - sudo apt-get install -y hhvm + sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm HHVM_LOG=$(realpath "$DIR")/hhvm.log |