From de2903ad82b26a761115a76d540657bc38e994d1 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sun, 26 Nov 2023 03:55:45 +0530 Subject: [PATCH] Fix installing zts builds --- src/scripts/unix.sh | 2 +- src/scripts/win32.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/unix.sh b/src/scripts/unix.sh index 6abde86f..f8905025 100644 --- a/src/scripts/unix.sh +++ b/src/scripts/unix.sh @@ -51,7 +51,7 @@ 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 + [[ "${phpts:-${PHPTS:-nts}}" = "ts" || "${phpts:-${PHPTS:-nts}}" = "zts" ]] && ts=zts && update=true || ts=nts fail_fast="${fail_fast:-${FAIL_FAST:-false}}" [[ -z "${ImageOS}" && -z "${ImageVersion}" || -n ${ACT} ]] && _runner=self-hosted || _runner=github runner="${runner:-${RUNNER:-$_runner}}" diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index e9bae624..fa234457 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -332,8 +332,8 @@ if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') { $arch = 'x86' } -$ts = $env:PHPTS -eq 'ts' -if($env:PHPTS -ne 'ts') { +$ts = ($env:PHPTS -match '^z?ts$') +if(-not($ts)) { $env:PHPTS = '-nts' } else { $env:PHPTS = ''