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

Switch Windows hostedtoolcache provisioner to GitHub Actions NPM registry (#315)

Browse Source 
* Toolcache: add basic error handling in Windows toolcache provisioner

* Toolcache: add GITHUB_FEED_TOKEN into packer templates for Windows

* Toolcache: separate toolcache.json for Windows

* Rework "Validate-ToolCache" script (#6)

* Rework validate toolcache script

* change boost root folder

* Add boost 1.69 for windows-2019

* Add toolcache config variable to Windows 16, 19

* Revert "Add toolcache config variable to Windows 16, 19"

* Add default boost version for validate-boost VS19

* Remove bjam test for boost

* Add boost 1.72 validation for win-2016

Co-authored-by: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com>
Co-authored-by: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
This commit is contained in:
Maksim Petrov
2020-01-29 10:41:09 +03:00
committed by GitHub
parent e0f5ff2061
commit 0967620111
9 changed files with 187 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
images/win/scripts/Installers/Validate-Boost.ps1
View File

@@ -13,10 +13,10 @@ function Validate-BoostVersion
$ReleasePath = Join-Path -Path $BoostRootPath -ChildPath $BoostRelease
if ((Test-Path "$ReleasePath\b2.exe") -and (Test-Path "$ReleasePath\bjam.exe"))
if (Test-Path "$ReleasePath\b2.exe")
{
Write-Host "Boost.Build $BoostRelease is successfully installed"
Write-Host "Boost.Jam $BoostRelease is successfully installed"
return
}
@@ -25,7 +25,7 @@ function Validate-BoostVersion
}
# Verify that Boost is on the path
if ((Get-Command -Name 'b2') -and (Get-Command -Name 'bjam'))
if (Get-Command -Name 'b2')
{
Write-Host "Boost is on the path"
}
@@ -54,15 +54,15 @@ $tmplMarkRoot = @"
$SoftwareName = 'Boost'
$Description = New-Object System.Text.StringBuilder
$BoostRootDirectory = Join-Path -Path $env:ProgramFiles -ChildPath "Boost"
$BoostRootDirectory = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Boost"
$BoostVersionsToInstall = $env:BOOST_VERSIONS.split(",")
foreach($Boost in $BoostVersionsToInstall)
foreach($BoostVersion in $BoostVersionsToInstall)
{
Validate-BoostVersion -BoostRootPath $BoostRootDirectory -BoostRelease $Boost
$BoostVersionTag = "BOOST_ROOT_{0}" -f $Boost.Replace('.', '_')
Validate-BoostVersion -BoostRootPath $BoostRootDirectory -BoostRelease $BoostVersion
$BoostVersionTag = "BOOST_ROOT_{0}" -f $BoostVersion.Replace('.', '_')
if($boost -eq $env:BOOST_DEFAULT)
if($BoostVersion -eq $env:BOOST_DEFAULT)
{
$null = $Description.AppendLine(($tmplMarkRoot -f $BoostVersion, $BoostVersionTag))
}