Skip to content

Use php-fpm with hhvm-serve everywhere #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use php-fpm with hhvm-serve everywhere #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
808a5c6
Update drupal.sh
LionsAd Oct 18, 2016
243c8f0
Update drupal.sh
LionsAd Oct 18, 2016
2cc6e71
Update install.sh
LionsAd Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion functions/drupal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ function drupal_ti_run_server() {

# Use hhvm_serve for PHP 5.3 fcgi and hhvm fcgi
PHP_VERSION=$(phpenv version-name)

# Hack: Remove me.
PHP_VERSION="hhvm"

if [ "$PHP_VERSION" = "5.3" -o "$PHP_VERSION" = "hhvm" ]
then
export GOPATH="$DRUPAL_TI_DIST_DIR/go"
Expand Down Expand Up @@ -182,7 +186,9 @@ function drupal_ti_ensure_php_for_drush_webserver() {
PHP_VERSION=$(phpenv version-name)
if [ "$PHP_VERSION" != "5.3" -a "$PHP_VERSION" != "hhvm" ]
then
return
# Hack: Remove me.
#return
echo "Overriding PHP version check" 1>&2
fi
if [ "$PHP_VERSION" = "hhvm" ]
then
Expand Down
3 changes: 3 additions & 0 deletions runners/phpunit-core/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

set -e $DRUPAL_TI_DEBUG

# Ensure drush webserver can be started for PHP 5.3 / HHVM
drupal_ti_ensure_php_for_drush_webserver

# Ensure that drush is installed.
drupal_ti_ensure_drush

Expand Down