Skip to content

Commit

Permalink
Merge branch 'improv/zts' of https://github.com/flavioheleno/setup-php
Browse files Browse the repository at this point in the history
…into flavioheleno-improv/zts
  • Loading branch information
shivammathur committed Oct 17, 2022
2 parents 12b1efa + f99a9d4 commit 37dcd1c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/scripts/linux.sh
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions src/scripts/unix.sh
Expand Up @@ -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"
Expand Down

0 comments on commit 37dcd1c

Please sign in to comment.