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

[Windows] Add NSIS to Windows Server 2022 (#4326)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2021-10-26 14:16:20 +03:00
committed by GitHub
parent c353eee691
commit 1f97f5de37
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -111,6 +111,7 @@ $toolsList = @(
(Get-MercurialVersion), (Get-MercurialVersion),
(Get-MinGWVersion), (Get-MinGWVersion),
(Get-NewmanVersion), (Get-NewmanVersion),
(Get-NSISVersion),
(Get-OpenSSLVersion), (Get-OpenSSLVersion),
(Get-PackerVersion), (Get-PackerVersion),
(Get-PulumiVersion), (Get-PulumiVersion),
@@ -125,7 +126,6 @@ $toolsList = @(
) )
if ((Test-IsWin16) -or (Test-IsWin19)) { if ((Test-IsWin16) -or (Test-IsWin19)) {
$toolsList += @( $toolsList += @(
(Get-NSISVersion),
(Get-GoogleCloudSDKVersion) (Get-GoogleCloudSDKVersion)
) )
} }

2
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -117,7 +117,7 @@ Describe "NET48" {
} }
} }
Describe "NSIS" -Skip:(Test-IsWin22) { Describe "NSIS" {
It "NSIS" { It "NSIS" {
"makensis /VERSION" | Should -ReturnZeroExitCode "makensis /VERSION" | Should -ReturnZeroExitCode
} }

1
images/win/windows2022.json
View File

@@ -223,6 +223,7 @@
"{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1",
"{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1",
"{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1",
"{{ template_dir }}/scripts/Installers/Install-NSIS.ps1",
"{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1",
"{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1",
"{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1",