actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move WSL installation to toolsets (#3906)

Browse Source
This commit is contained in:
Maxim Lobanov
2021-08-17 17:57:09 +03:00
committed by GitHub
parent 5b7a0eee31
commit 133db65488
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ function InstallAllValidSdks()
ForEach ($sdk in $sdks) ForEach ($sdk in $sdks)
{ {
InstallSDKVersion -sdkVersion $sdk.'version' InstallSDKVersion -sdkVersion $sdk.'version' -Warmup $warmup
} }
} }
elseif (!$release.'sdk'.'version'.Contains('-')) elseif (!$release.'sdk'.'version'.Contains('-'))

8
images/win/scripts/Installers/Windows2019/Install-WSL.ps1
View File

@@ -1,8 +0,0 @@
################################################################################
## File: Install-WSL.ps1
## Desc: Install Windows Subsystem for Linux
################################################################################
Write-Host "Install Windows Subsystem for Linux"
Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux -NoRestart

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

@@ -252,7 +252,9 @@
{ "name": "NET-Framework-Features", "includeAllSubFeatures": true }, { "name": "NET-Framework-Features", "includeAllSubFeatures": true },
{ "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true },
{ "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true }, { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true },
{ "name": "Containers" } { "name": "Containers" },
{ "name": "Microsoft-Windows-Subsystem-Linux", "optionalFeature": true },
{ "name": "VirtualMachinePlatform", "optionalFeature": true }
], ],
"visualStudio": { "visualStudio": {
"version" : "2019", "version" : "2019",

8
images/win/windows2019.json
View File

@@ -129,14 +129,6 @@
], ],
"execution_policy": "unrestricted" "execution_policy": "unrestricted"
}, },
{
"type": "powershell",
"elevated_user": "SYSTEM",
"elevated_password": "",
"scripts": [
"{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1"
]
},
{ {
"type": "windows-restart", "type": "windows-restart",
"restart_timeout": "10m" "restart_timeout": "10m"