diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-23 16:26:05 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-23 16:26:05 +0100 |
| commit | fb8f05dde79e35c6f9911c493d1b8ad051feb54b (patch) | |
| tree | 5067a8e9d83ee53af2ef480840e97e2c3843e58b | |
| parent | 8a4f97c66a7d4dce07fece4dc059c0be0a2b6f33 (diff) | |
try to add support for hhvm
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | tests/travis/travis-ci-apache-hhvm.conf | 25 | ||||
| -rw-r--r-- | tests/travis/travis-ci-apache.sh | 12 |
3 files changed, 38 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 68febcd68..5123028ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: php php: - - 5.4 - - 5.5 - - 5.6 +# - 5.4 +# - 5.5 +# - 5.6 - hhvm matrix: @@ -11,8 +11,8 @@ matrix: env: - DB=sqlite - - DB=postgresql - - DB=mysql +# - DB=postgresql +# - DB=mysql before_install: # get a newer node.js version diff --git a/tests/travis/travis-ci-apache-hhvm.conf b/tests/travis/travis-ci-apache-hhvm.conf new file mode 100644 index 000000000..dbfbfae2c --- /dev/null +++ b/tests/travis/travis-ci-apache-hhvm.conf @@ -0,0 +1,25 @@ +<VirtualHost *:80> + + DocumentRoot %TRAVIS_BUILD_DIR% + + <Directory "%TRAVIS_BUILD_DIR%"> + Options FollowSymLinks MultiViews ExecCGI + AllowOverride All + Order deny,allow + Allow from all + </Directory> + + # Configure Apache for HHVM FastCGI. + # See https://github.com/facebook/hhvm/wiki/fastcgi. + <IfModule mod_fastcgi.c> + <FilesMatch \.php$> + SetHandler hhvm-php-extension + </FilesMatch> + + Alias /hhvm /hhvm + Action hhvm-php-extension /hhvm virtual + + FastCgiExternalServer /hhvm -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 300 + </IfModule> + +</VirtualHost> diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh index d8a514a72..cfa085cac 100644 --- a/tests/travis/travis-ci-apache.sh +++ b/tests/travis/travis-ci-apache.sh @@ -1,13 +1,17 @@ # set up php under apache -if [[ $(phpenv version-name) != 'hhvm' ]]; then +if [[ $(phpenv version-name) == 'hhvm' ]]; then + sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache-hhvm.conf /etc/apache2/sites-available/default + sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default + sudo service apache2 restart + hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true +else sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf sudo a2enmod rewrite actions fastcgi alias echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache.conf /etc/apache2/sites-available/default sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default -else - + sudo service apache2 restart fi -sudo service apache2 restart
\ No newline at end of file + |