Skip to content

Commit ae8fd48

Browse files
committed
Merge pull request #246 from FriendsOfSymfony/fix-hhvm-build
Try to fix HHVM build
2 parents 90bed43 + e58c5fc commit ae8fd48

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,7 @@ after_script:
5252
after_failure:
5353
- cat /tmp/fos_nginx_error.log
5454
- cat /tmp/fos_nginx_access.log
55+
- cat /tmp/hhvm.log
56+
- sudo cat /var/log/apache2/error.log
57+
- sudo cat /var/log/apache2/access.log
58+
- sudo cat /var/log/apache2/other_vhosts_access.log

tests/ci/install-apache-hhvm.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ sudo cp -f tests/ci/travis-ci-apache-hhvm /etc/apache2/sites-available/default
99
sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
1010
sudo service apache2 restart
1111

12+
echo "starting HHVM"
13+
1214
# Run HHVM
13-
hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true
15+
echo "PIDFILE=\"/tmp/hhvm.pid\"" >> /etc/default/hhvm
16+
hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9090 -vServer.FixPathInfo=true -vLog.Level=verbose -vLog.UseLogFile=true -vLog.File=/tmp/hhvm.log -vLog.AlwaysLogUnhandledExceptions=true

tests/ci/travis-ci-apache-hhvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Listen 8080
2020
Alias /hhvm /hhvm
2121
Action hhvm-php-extension /hhvm virtual
2222

23-
FastCgiExternalServer /hhvm -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 300
23+
FastCgiExternalServer /hhvm -host 127.0.0.1:9090 -pass-header Authorization -idle-timeout 300
2424
</IfModule>
2525

2626
</VirtualHost>

0 commit comments

Comments
 (0)