Merge branch 'improv/zts' of https://github.com/flavioheleno/setup-php into flavioheleno-improv/zts

This commit is contained in:
Shivam Mathur 2022-10-17 17:03:20 +05:30
commit 37dcd1cf8c
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
2 changed files with 8 additions and 2 deletions

View File

@ -96,7 +96,7 @@ add_devtools() {
# Function to setup the nightly build from shivammathur/php-builder # Function to setup the nightly build from shivammathur/php-builder
setup_nightly() { 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. # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
@ -167,7 +167,7 @@ update_php() {
# Function to install PHP. # Function to install PHP.
add_php() { add_php() {
if [[ "$version" =~ ${nightly_versions:?} ]]; then if [[ "$version" =~ ${nightly_versions:?} ]] || [[ "${ts:?}" = "zts" ]]; then
setup_nightly setup_nightly
elif [[ "$version" =~ ${old_versions:?} ]]; then elif [[ "$version" =~ ${old_versions:?} ]]; then
setup_old_versions setup_old_versions

View File

@ -51,10 +51,16 @@ set_output() {
read_env() { read_env() {
update="${update:-${UPDATE:-false}}" update="${update:-${UPDATE:-false}}"
[ "${debug:-${DEBUG:-false}}" = "true" ] && debug=debug && update=true || debug=release [ "${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}}" fail_fast="${fail_fast:-${FAIL_FAST:-false}}"
[[ -z "${ImageOS}" && -z "${ImageVersion}" ]] && _runner=self-hosted || _runner=github [[ -z "${ImageOS}" && -z "${ImageVersion}" ]] && _runner=self-hosted || _runner=github
runner="${runner:-${RUNNER:-$_runner}}" runner="${runner:-${RUNNER:-$_runner}}"
export fail_fast
export runner
export update
export ts
if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then
fail_fast=true fail_fast=true
add_log "$cross" "Runner" "Runner set as github in self-hosted environment" add_log "$cross" "Runner" "Runner set as github in self-hosted environment"