Compare commits

..

2 Commits
2.35.1 ... main

Author SHA1 Message Date
ccf2c627fe Bump version to 2.35.2 2025-07-29 19:08:58 +05:30
2a597f617d Fix race condition 2025-07-29 02:08:56 +05:30
4 changed files with 10 additions and 10 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "setup-php",
"version": "2.35.1",
"version": "2.35.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "setup-php",
"version": "2.35.1",
"version": "2.35.2",
"license": "MIT",
"dependencies": {
"@actions/core": "^1.11.1",

View File

@ -1,6 +1,6 @@
{
"name": "setup-php",
"version": "2.35.1",
"version": "2.35.2",
"private": false,
"description": "Setup PHP for use with GitHub Actions",
"main": "lib/install.js",

View File

@ -28,8 +28,8 @@ Function Edit-ComposerConfig() {
Set-ComposerAuth
}
# Function to merge auth.json fragments.
Function Get-MergedAuthJson {
# Function to update auth.json.
Function Update-AuthJson {
[CmdletBinding()]
param(
[Parameter(Mandatory)][string[]] $ComposerAuth
@ -58,7 +58,7 @@ Function Get-MergedAuthJson {
}
}
}
return $existing | ConvertTo-Json -Depth 5
Set-Content -Path $composer_home\auth.json -Value ($existing | ConvertTo-Json -Depth 5)
}
# Function to setup authentication in composer.
@ -81,7 +81,7 @@ Function Set-ComposerAuth() {
$composer_auth += '"github-oauth": {"github.com": "' + $env:GITHUB_TOKEN + '"}'
}
if($composer_auth.length) {
Set-Content -Path $composer_home\auth.json -Value (Get-MergedAuthJson $composer_auth)
Update-AuthJson $composer_auth
}
}

View File

@ -47,7 +47,7 @@ configure_composer() {
}
# Function to merge auth.json fragments.
get_merged_auth_json() {
update_auth_json() {
local auth_file="$composer_home/auth.json"
local merged
[[ -f "$auth_file" ]] && merged=$(<"$auth_file") || merged='{}'
@ -62,7 +62,7 @@ get_merged_auth_json() {
end
')
done
printf '%s' "$merged"
printf '%s' "$merged" > "$composer_home/auth.json"
}
# Function to setup authentication in composer.
@ -82,7 +82,7 @@ set_composer_auth() {
composer_auth+=( '"github-oauth": {"github.com": "'"${GITHUB_TOKEN:-$COMPOSER_TOKEN}"'"}' )
fi
if ((${#composer_auth[@]})); then
get_merged_auth_json "${composer_auth[@]}" | tee "$composer_home/auth.json" >/dev/null
update_auth_json "${composer_auth[@]}"
fi
}