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

[Windows] move llvm to toolset (#4487)

Browse Source
This commit is contained in:
Mikhail Koliada
2021-11-15 12:54:35 +03:00
committed by GitHub
parent 6dc8234648
commit fad30aa851
7 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/win/scripts/Installers/Install-LLVM.ps1 Normal file
View File

@@ -0,0 +1,10 @@
################################################################################
## File: Install-LLVM.ps1
## Desc: Install the latest stable version of llvm and clang compilers
################################################################################
$llvmVersion = (Get-ToolsetContent).llvm.version
$latestChocoVersion = Get-LatestChocoPackageVersion -TargetVersion $llvmVersion -PackageName "llvm"
Choco-Install -PackageName llvm -ArgumentList "--version $latestChocoVersion"
Invoke-PesterTests -TestFile "LLVM"

7
images/win/scripts/Tests/LLVM.Tests.ps1 Normal file
View File

@@ -0,0 +1,7 @@
Describe "Clang/LLVM" {
It "Clang/LLVM installed and version is correct" {
$toolsetVersion = (Get-ToolsetContent).llvm.version
$clangVersion = clang --version
$clangVersion[0] | Should -BeLike "*${toolsetVersion}*"
}
}

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

@@ -81,15 +81,6 @@ Describe "KubernetesTools" {
}
}
Describe "LLVM" {
It "<ToolName>" -TestCases @(
@{ ToolName = "clang" }
@{ ToolName = "clang++" }
) {
"$ToolName --version" | Should -ReturnZeroExitCode
}
}
Describe "Mingw64" {
It "<ToolName>" -TestCases @(
@{ ToolName = "gcc" }

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

@@ -397,7 +397,6 @@
{ "name": "gitversion.portable" },
{ "name": "innosetup" },
{ "name": "jq" },
{ "name": "llvm" },
{ "name": "NuGet.CommandLine" },
{
"name": "openssl.light",
@@ -427,5 +426,8 @@
},
"mongodb": {
"version": "5.0"
},
"llvm": {
"version": "13"
}
}

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

@@ -429,7 +429,6 @@
{ "name": "gitversion.portable" },
{ "name": "innosetup" },
{ "name": "jq" },
{ "name": "llvm" },
{ "name": "NuGet.CommandLine" },
{
"name": "openssl.light",
@@ -459,5 +458,8 @@
},
"mongodb": {
"version": "5.0"
},
"llvm": {
"version": "13"
}
}

3
images/win/windows2016.json
View File

@@ -206,7 +206,8 @@
"{{ template_dir }}/scripts/Installers/Install-Selenium.ps1",
"{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1",
"{{ template_dir }}/scripts/Installers/Install-Apache.ps1",
"{{ template_dir }}/scripts/Installers/Install-Nginx.ps1"
"{{ template_dir }}/scripts/Installers/Install-Nginx.ps1",
"{{ template_dir }}/scripts/Installers/Install-LLVM.ps1"
]
},
{

3
images/win/windows2019.json
View File

@@ -267,7 +267,8 @@
"{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
"{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1",
"{{ template_dir }}/scripts/Installers/Configure-Shell.ps1",
"{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
"{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1",
"{{ template_dir }}/scripts/Installers/Install-LLVM.ps1"
]
},
{