mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
[ticket/12318] Always install new config file on HHVM upgrade conflict.
PHPBB3-12318
This commit is contained in:
parent
a53312636a
commit
d53c411d90
1 changed files with 1 additions and 1 deletions
|
@ -26,7 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock
|
||||||
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
|
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
|
||||||
then
|
then
|
||||||
# Upgrade to a recent stable version of HHVM
|
# 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
|
HHVM_LOG=$(realpath "$DIR")/hhvm.log
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue