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

Install llvm version correctly (#5288)

Browse Source 
* Install llvm version correctly

* Move llvm installation to script for win22
This commit is contained in:
Mikhail Timofeev
2022-03-26 23:24:26 +04:00
committed by GitHub
parent 7fc477ed20
commit bdd8f81329
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,6 @@
$llvmVersion = (Get-ToolsetContent).llvm.version $llvmVersion = (Get-ToolsetContent).llvm.version
$latestChocoVersion = Get-LatestChocoPackageVersion -TargetVersion $llvmVersion -PackageName "llvm" $latestChocoVersion = Get-LatestChocoPackageVersion -TargetVersion $llvmVersion -PackageName "llvm"
Choco-Install -PackageName llvm -ArgumentList "--version $latestChocoVersion" Choco-Install -PackageName llvm -ArgumentList '--version', $latestChocoVersion
Invoke-PesterTests -TestFile "LLVM" Invoke-PesterTests -TestFile "LLVM"

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

@@ -306,7 +306,6 @@
{ "name": "Bicep" }, { "name": "Bicep" },
{ "name": "innosetup" }, { "name": "innosetup" },
{ "name": "jq" }, { "name": "jq" },
{ "name": "llvm" },
{ "name": "NuGet.CommandLine" }, { "name": "NuGet.CommandLine" },
{ {
"name": "openssl.light", "name": "openssl.light",
@@ -340,6 +339,9 @@
"nsis": { "nsis": {
"version": "3.08" "version": "3.08"
}, },
"llvm": {
"version": "13"
},
"php": { "php": {
"version": "8.1" "version": "8.1"
}, },

3
images/win/windows2022.json
View File

@@ -255,7 +255,8 @@
"{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
"{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1",
"{{ template_dir }}/scripts/Installers/Configure-Shell.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"
], ],
"elevated_user": "{{user `install_user`}}", "elevated_user": "{{user `install_user`}}",
"elevated_password": "{{user `install_password`}}" "elevated_password": "{{user `install_password`}}"