Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Commit 4e4f0f3

Browse files
authored
Merge pull request #551 from netlify/ingrid/default-php-version-xenial
chore: default php version to 5.6 in xenial
2 parents 7b53c5f + e5d8a01 commit 4e4f0f3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

run-build-functions.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export GIMME_CGO_ENABLED=true
1818
export NVM_DIR="$HOME/.nvm"
1919
export RVM_DIR="$HOME/.rvm"
2020

21+
# PHP configuration
22+
DEFAULT_PHP_VERSION="5.6"
23+
2124
# Swift configuration
2225
export SWIFTENV_ROOT="${SWIFTENV_ROOT:-${HOME}/.swiftenv}"
2326
DEFAULT_SWIFT_VERSION="5.2"
@@ -215,9 +218,8 @@ install_dependencies() {
215218
local defaultNodeVersion=$1
216219
local defaultRubyVersion=$2
217220
local defaultYarnVersion=$3
218-
local defaultPHPVersion=$4
219-
local installGoVersion=$5
220-
local defaultPythonVersion=$6
221+
local installGoVersion=$4
222+
local defaultPythonVersion=$5
221223

222224
# Python Version
223225
if [ -f runtime.txt ]
@@ -372,7 +374,7 @@ install_dependencies() {
372374
export JAVA_VERSION=default_sdk
373375

374376
# PHP version
375-
: ${PHP_VERSION="$defaultPHPVersion"}
377+
: ${PHP_VERSION="$DEFAULT_PHP_VERSION"}
376378
if [ -f /usr/bin/php$PHP_VERSION ]
377379
then
378380
if ln -sf /usr/bin/php$PHP_VERSION $HOME/.php/php

run-build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ cd $NETLIFY_REPO_DIR
2121
: ${NODE_VERSION="12.18.0"}
2222
: ${RUBY_VERSION="2.7.1"}
2323
: ${YARN_VERSION="1.22.4"}
24-
: ${PHP_VERSION="5.6"}
2524
: ${GO_VERSION="1.14.4"}
2625
: ${PYTHON_VERSION="2.7"}
2726

2827
echo "Installing dependencies"
29-
install_dependencies $NODE_VERSION $RUBY_VERSION $YARN_VERSION $PHP_VERSION $GO_VERSION $PYTHON_VERSION
28+
install_dependencies $NODE_VERSION $RUBY_VERSION $YARN_VERSION $GO_VERSION $PYTHON_VERSION
3029

3130
echo "Installing missing commands"
3231
install_missing_commands

0 commit comments

Comments
 (0)