actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2024-11-22 20:01:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Default to self-hosted unless GitHub hosted runner is detected

Browse Source 
Refactor read_env in unix.sh
This commit is contained in:
Shivam Mathur 2022-01-12 21:15:11 +05:30
parent f7f679181d
commit 3a4acaaed8
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scripts/unix.sh
View File

@ -32,11 +32,10 @@ add_log() {
# Function to read env inputs. # Function to read env inputs.
read_env() { read_env() {
[[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}" update="${update:-${UPDATE:-false}}"
[ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}" fail_fast="${fail_fast:-${FAIL_FAST:-false}}"
[[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}" [[ -z "${ImageOS}" && -z "${ImageVersion}" ]] && _runner=self-hosted || _runner=github
[ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}" runner="${runner:-${RUNNER:-$_runner}}"
[[ -z "${fail_fast}" ]] && fail_fast='false' || fail_fast="${fail_fast}"
} }
# Function to download a file using cURL. # Function to download a file using cURL.

2
src/scripts/win32.ps1
View File

@ -169,7 +169,7 @@ $ts = $env:PHPTS -eq 'ts'
if($env:PHPTS -ne 'ts') { if($env:PHPTS -ne 'ts') {
$env:PHPTS = 'nts' $env:PHPTS = 'nts'
} }
if($env:RUNNER -eq 'self-hosted') { if($env:RUNNER -eq 'self-hosted' -or (-not($env:ImageOS) -and -not($env:ImageVersion))) {
$bin_dir = 'C:\tools\bin' $bin_dir = 'C:\tools\bin'
$php_dir = "$php_dir$version" $php_dir = "$php_dir$version"
$ext_dir = "$php_dir\ext" $ext_dir = "$php_dir\ext"