Skip to content

Commit 68417c5

Browse files
authored
[WIndows] Update OpenSSL to 3.* on windows-2022 and script itself (#13119)
1 parent 1c51342 commit 68417c5

File tree

4 files changed

+6
-18
lines changed

4 files changed

+6
-18
lines changed

images/windows/scripts/build/Install-OpenSSL.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $installerHash = $null
2222

2323
foreach ($key in $installerNames) {
2424
$installer = $installersAvailable.$key
25-
if (($installer.light -eq $light) -and ($installer.arch -eq $arch) -and ($installer.bits -eq $bits) -and ($installer.installer -eq $installerType) -and ($installer.basever -eq $version)) {
25+
if (($installer.light -eq $light) -and ($installer.arch -eq $arch) -and ($installer.bits -eq $bits) -and ($installer.installer -eq $installerType) -and ($installer.basever -like $version)) {
2626
$installerUrl = $installer.url
2727
$installerHash = $installer.sha512
2828
}

images/windows/toolsets/toolset-2019.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,9 @@
445445
"openssl": {
446446
"version": "1.1.1",
447447
"pinnedDetails": {
448-
"link": "https://github.com/somelink",
449-
"reason": "this was pinned due to a downstream issue with the installer",
450-
"review-at": "2025-01-30"
448+
"link": "https://github.com/actions/runner-images/issues/12045",
449+
"reason": "Image is deprecated and will be removed soon",
450+
"review-at": "2027-01-01"
451451
}
452452
},
453453
"pwsh": {

images/windows/toolsets/toolset-2022.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,7 @@
363363
"version": "latest"
364364
},
365365
"openssl": {
366-
"version": "1.1.1",
367-
"pinnedDetails": {
368-
"link": "https://github.com/actions/runner-images-internal/pull/6702",
369-
"reason": "Meaningful reason must be added at next update.",
370-
"review-at": "2024-06-01",
371-
"type": "preexisting-pinned-version-without-reason"
372-
}
366+
"version": "3.*"
373367
},
374368
"pwsh": {
375369
"version": "7.4"

images/windows/toolsets/toolset-2025.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,7 @@
328328
"version": "latest"
329329
},
330330
"openssl": {
331-
"version": "3.5.3",
332-
"pinnedDetails": {
333-
"link": "https://github.com/openssl/openssl/releases/tag/openssl-3.5.3",
334-
"reason": "Installer not found for version 3.5.2",
335-
"review-at": "2025-10-10",
336-
"type": "preexisting-pinned-version-without-reason"
337-
}
331+
"version": "3.*"
338332
},
339333
"pwsh": {
340334
"version": "7.4"

0 commit comments

Comments
 (0)