diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index e9ccab558..7b8c6b49c 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -96,7 +96,7 @@ add_devtools() { # Function to setup the nightly build from shivammathur/php-builder setup_nightly() { - run_script "php-builder" "${runner:?}" "$version" "${debug:?}" + run_script "php-builder" "${runner:?}" "$version" "${debug:?}" ${ts:?} } # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5. @@ -167,7 +167,7 @@ update_php() { # Function to install PHP. add_php() { - if [[ "$version" =~ ${nightly_versions:?} ]]; then + if [[ "$version" =~ ${nightly_versions:?} ]] || [[ "${ts:?}" = "zts" ]]; then setup_nightly elif [[ "$version" =~ ${old_versions:?} ]]; then setup_old_versions diff --git a/src/scripts/unix.sh b/src/scripts/unix.sh index 603611d56..d8cc31401 100644 --- a/src/scripts/unix.sh +++ b/src/scripts/unix.sh @@ -51,10 +51,16 @@ set_output() { read_env() { update="${update:-${UPDATE:-false}}" [ "${debug:-${DEBUG:-false}}" = "true" ] && debug=debug && update=true || debug=release + [ "${phpts:-${PHPTS:-nts}}" = "ts" ] && ts=zts && update=true || ts=nts fail_fast="${fail_fast:-${FAIL_FAST:-false}}" [[ -z "${ImageOS}" && -z "${ImageVersion}" ]] && _runner=self-hosted || _runner=github runner="${runner:-${RUNNER:-$_runner}}" + export fail_fast + export runner + export update + export ts + if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then fail_fast=true add_log "$cross" "Runner" "Runner set as github in self-hosted environment"