actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-20 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make install optional as probably not needed for next windows 2025 build

Browse Source
This commit is contained in:
lawrencegripper
2024-11-29 11:01:49 +00:00
parent 1acb48ed45
commit 3f89591af5
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
images/windows/scripts/build/Install-PostgreSQL.ps1
View File

@@ -58,12 +58,14 @@ if ($null -ne ($toolsetVersion | Select-String -Pattern '\d+\.\d+\.\d+')) {
} while (!$response) } while (!$response)
} }
# Postgres 14 requires the vs 17 redistributable if ((Get-ToolsetContent).postgresql.installVcRedist) {
$vs17RedistUrl = "https://aka.ms/vs/17/release/vc_redist.x64.exe" # Postgres 14 requires the vs 17 redistributable
Install-Binary ` $vs17RedistUrl = "https://aka.ms/vs/17/release/vc_redist.x64.exe"
-Url $vs17RedistUrl ` Install-Binary `
-InstallArgs @("/install", "/quiet", "/norestart") ` -Url $vs17RedistUrl `
-ExpectedSignature (Get-ToolsetContent).postgresql.vcRedistSignature -InstallArgs @("/install", "/quiet", "/norestart") `
-ExpectedSignature (Get-ToolsetContent).postgresql.vcRedistSignature
}
# Return the previous value of ErrorAction and invoke Install-Binary function # Return the previous value of ErrorAction and invoke Install-Binary function
$ErrorActionPreference = $errorActionOldValue $ErrorActionPreference = $errorActionOldValue

3
images/windows/toolsets/toolset-2019.json
View File

@@ -474,7 +474,8 @@
"postgresql": { "postgresql": {
"signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9",
"version": "14", "version": "14",
"vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D",
"installVcRedist": true
}, },
"kotlin": { "kotlin": {
"version": "latest" "version": "latest"

3
images/windows/toolsets/toolset-2022.json
View File

@@ -383,7 +383,8 @@
"postgresql": { "postgresql": {
"signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9",
"version": "14", "version": "14",
"vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D",
"installVcRedist": true
}, },
"kotlin": { "kotlin": {
"version": "latest" "version": "latest"