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

remove boost from ubuntu images (#2844)

Browse Source
This commit is contained in:
Mikhail Timofeev
2021-03-05 10:22:42 +03:00
committed by GitHub
parent 6ec7e94c45
commit adcbf9592c
6 changed files with 1 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
View File

@@ -41,44 +41,9 @@ function Build-GoEnvironmentTable {
}
}
function Get-ToolcacheBoostVersions {
$Name = "Boost"
$toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "boost"
if (-not (Test-Path $toolcachePath)) {
return @()
}
$BoostVersions = Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ }
$ToolInstances = $BoostVersions | ForEach-Object {
$VersionEnvVar = $_.replace(".", "_")
return @{
Version = $_
Architecture = "x64"
"Environment Variable" = "BOOST_ROOT_${VersionEnvVar}"
}
}
$Content = $ToolInstances | New-MDTable -Columns ([ordered]@{
Version = "left";
Architecture = "left";
"Environment Variable" = "left"
})
$markdown = ""
if ($Content.Count -gt 0) {
$markdown += New-MDHeader $Name -Level 4
$markdown += New-MDParagraph -Lines $Content
}
return $markdown
}
function Build-CachedToolsSection {
$output = ""
$output += Get-ToolcacheBoostVersions
$output += New-MDHeader "Go" -Level 4
$output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered

8
images/linux/scripts/helpers/SoftwareReport.Helpers.psm1
View File

@@ -80,14 +80,6 @@ function Get-CachedToolInstances
[string]$instanceInfo.Path = Join-Path -Path $toolPath -ChildPath $version.Name
[string]$instanceInfo.Version = $version.Name
### Temporary workaround. Currently Boost instances don't have architecture subfolders.
if ($Name -eq "Boost")
{
[string]$instanceInfo.Architecture = "x64, x86"
$toolInstances += $instanceInfo
continue
}
# Get all architectures for current version
[array]$instanceInfo.Architecture_Array = Get-ChildItem $version.FullName -Name -Directory | Where-Object { $_ -match "^x[0-9]{2}$" }
[string]$instanceInfo.Architecture = $instanceInfo.Architecture_Array -Join ", "

3
images/linux/scripts/installers/Configure-Toolset.ps1
View File

@@ -39,9 +39,6 @@ $ErrorActionPreference = "Stop"
Write-Host "Configure toolset tools environment..."
$toolsEnvironment = @{
boost = @{
variableTemplate = "BOOST_ROOT_{0}_{1}_{2}"
}
go = @{
command = "ln -s {0}/bin/* /usr/bin/"
variableTemplate = "GOROOT_{0}_{1}_X64"

2
images/linux/scripts/installers/Install-Toolset.ps1
View File

@@ -28,7 +28,7 @@ $ErrorActionPreference = "Stop"
# Get toolset content
$toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw
$toolsToInstall = @("Python", "Node", "Boost", "Go")
$toolsToInstall = @("Python", "Node", "Go")
$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name}

10
images/linux/toolsets/toolset-1604.json
View File

@@ -47,16 +47,6 @@
],
"default": "1.15.*"
},
{
"name": "boost",
"url" : "https://raw.githubusercontent.com/actions/boost-versions/main/versions-manifest.json",
"platform" : "linux",
"platform_version": "16.04",
"arch": "x64",
"versions": [
"1.72.0"
]
},
{
"name": "Ruby",
"platform_version": "16.04",

10
images/linux/toolsets/toolset-1804.json
View File

@@ -47,16 +47,6 @@
],
"default": "1.15.*"
},
{
"name": "boost",
"url" : "https://raw.githubusercontent.com/actions/boost-versions/main/versions-manifest.json",
"platform" : "linux",
"platform_version": "18.04",
"arch": "x64",
"versions": [
"1.72.0"
]
},
{
"name": "Ruby",
"platform_version": "18.04",