actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-08 11:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into releases/win19/20200827-docs

Browse Source
This commit is contained in:
Actions service account
2020-09-02 13:29:38 +00:00
parent 6401bea1df 265cc1fb88
commit f42bf10441
25 changed files with 223 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
images/win/Windows2016-Azure.json
View File

@@ -211,6 +211,7 @@
"{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1",
"{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1",
"{{ template_dir }}/scripts/Installers/Install-Packer.ps1",
"{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1",
"{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1"
]
},

1
images/win/Windows2019-Azure.json
View File

@@ -200,6 +200,7 @@
"{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
"{{ template_dir }}/scripts/Installers/Install-7zip.ps1",
"{{ template_dir }}/scripts/Installers/Install-Packer.ps1",
"{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1",
"{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1"
]
},

2
images/win/scripts/Installers/Install-DACFx.ps1
View File

@@ -6,7 +6,7 @@
Import-Module -Name ImageHelpers -Force
$InstallerName = "DacFramework.msi"
$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2128142"
$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2134206"
Install-Binary -Url $InstallerUrl -Name $InstallerName

2
images/win/scripts/Installers/Install-GoogleCloudSDK.ps1
View File

@@ -8,4 +8,4 @@ $googleCloudSDKInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/Goo
$argumentList = @("/S", "/allusers", "/noreporting")
Install-Binary -Url $googleCloudSDKInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList
Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCouldSDK"
Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudSDK"

8
images/win/scripts/Installers/Install-Pulumi.ps1 Normal file
View File

@@ -0,0 +1,8 @@
################################################################################
## File: Install-Pulumi.ps1
## Desc: Install Pulumi
################################################################################
Choco-Install -PackageName pulumi
Invoke-PesterTests -TestFile "Tools" -TestName "Pulumi"

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

@@ -94,6 +94,7 @@ $markdown += New-MDList -Style Unordered -Lines @(
(Get-NewmanVersion),
(Get-OpenSSLVersion),
(Get-PackerVersion),
(Get-PulumiVersion),
(Get-SQLPSVersion),
(Get-SQLServerPSVersion),
(Get-SVNVersion),

8
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -107,6 +107,10 @@ function Get-PackerVersion {
return "Packer $(packer --version)"
}
function Get-PulumiVersion {
return "Pulumi $(pulumi version)"
}
function Get-SQLPSVersion {
$module = Get-Module -Name SQLPS -ListAvailable
$version = $module.Version
@@ -222,7 +226,9 @@ function Get-NewmanVersion {
}
function Get-GHVersion {
return "GitHub CLI $(gh --version)"
($(gh --version) | Select-String -Pattern "gh version") -match "gh version (?<version>\d+\.\d+\.\d+)" | Out-Null
$ghVersion = $Matches.Version
return "GitHub CLI $ghVersion"
}
function Get-VisualCPPComponents {

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

@@ -130,7 +130,7 @@ Describe "InnoSetup" {
}
}
Describe "GoogleCouldSDK" {
Describe "GoogleCloudSDK" {
It "<ToolName>" -TestCases @(
@{ ToolName = "bq" }
@{ ToolName = "gcloud" }
@@ -187,6 +187,12 @@ Describe "PowerShell Core" {
}
}
Describe "Pulumi" {
It "pulumi" {
"pulumi version" | Should -ReturnZeroExitCode
}
}
Describe "Sbt" {
It "sbt" {
"sbt --version" | Should -ReturnZeroExitCode

3
images/win/toolsets/toolset-2016.json
View File

@@ -120,7 +120,8 @@
"3.5.0",
"3.8.0",
"4.3.0",
"4.4.0"
"4.4.0",
"4.6.0"
]
}
],

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

@@ -129,7 +129,8 @@
"3.5.0",
"3.8.0",
"4.3.0",
"4.4.0"
"4.4.0",
"4.6.0"
]
}
],