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

Switch provisioners to install Boost from GitHub releases on Ubuntu (#995)

Browse Source 
* switched provisioners to install Boost from GitHub releases on Ubuntu
* removed DocumentInstalledItem from boost.sh

Co-authored-by: Nikita Bykov <v-nibyko@microsoft.com>
This commit is contained in:
Nikita Bykov
2020-06-16 12:07:23 +03:00
committed by GitHub
parent 68a72ab612
commit 40caaf3e2c
7 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
images/linux/scripts/installers/Validate-Toolset.ps1
View File

@@ -45,8 +45,8 @@ foreach($tool in $tools) {
foreach ($version in $tool.versions) { foreach ($version in $tool.versions) {
# Add wildcard if missing # Add wildcard if missing
if (-not $version.Contains('*')) { if ($version.Split(".").Length -lt 3) {
$version += '.*' $version += ".*"
} }
# Check if version folder exists # Check if version folder exists
@@ -62,9 +62,10 @@ foreach($tool in $tools) {
| Select-Object -First 1 | Select-Object -First 1
$foundVersionPath = Join-Path $foundVersion $tool.arch $foundVersionPath = Join-Path $foundVersion $tool.arch
Write-Host "Run validation test for $($tool.name)($($tool.arch)) $($foundVersion.name) executables..." if ($toolExecs) {
Run-ExecutableTests -Executables $toolExecs -ToolPath $foundVersionPath Write-Host "Run validation test for $($tool.name)($($tool.arch)) $($foundVersion.name) executables..."
Run-ExecutableTests -Executables $toolExecs -ToolPath $foundVersionPath
}
$foundVersionName = $foundVersion.name $foundVersionName = $foundVersion.name
if ($tool.name -eq 'PyPy') if ($tool.name -eq 'PyPy')
{ {

13
images/linux/scripts/installers/boost.sh
View File

@@ -4,12 +4,10 @@
## Desc: Installs Boost C++ Libraries ## Desc: Installs Boost C++ Libraries
################################################################################ ################################################################################
# Source the helpers for use with the script TOOLSET_PATH="$INSTALLER_SCRIPT_FOLDER/toolset.json"
source $HELPER_SCRIPTS/document.sh BOOST_LIB="$AGENT_TOOLSDIRECTORY/boost"
BOOST_VERSIONS=$(cat $TOOLSET_PATH | jq -r '.toolcache[] | select(.name | contains("boost")) | .versions[]')
TOOLSET_PATH="$INSTALLER_SCRIPT_FOLDER/toolcache.json" BOOST_ARCH=$(cat $TOOLSET_PATH | jq -r '.toolcache[] | select(.name | contains("boost")) | .arch')
BOOST_LIB=/usr/local/share/boost
BOOST_VERSIONS=$(cat $TOOLSET_PATH | jq -r 'to_entries[] | select(.key | match("boost")) | .value[] +".0"')
# Install Boost # Install Boost
for BOOST_VERSION in ${BOOST_VERSIONS} for BOOST_VERSION in ${BOOST_VERSIONS}
@@ -17,6 +15,5 @@ do
BOOST_SYMLINK_VER=$(echo "${BOOST_VERSION//[.]/_}") BOOST_SYMLINK_VER=$(echo "${BOOST_VERSION//[.]/_}")
BOOST_ROOT_VERSION="BOOST_ROOT_$BOOST_SYMLINK_VER" BOOST_ROOT_VERSION="BOOST_ROOT_$BOOST_SYMLINK_VER"
echo "$BOOST_ROOT_VERSION=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment echo "$BOOST_ROOT_VERSION=$BOOST_LIB/$BOOST_VERSION/$BOOST_ARCH" | tee -a /etc/environment
DocumentInstalledItem "Boost C++ Libraries $BOOST_VERSION"
done done

3
images/linux/toolcache-1604.json
View File

@@ -1,8 +1,5 @@
{ {
"@actions/toolcache-ruby-ubuntu-1604-x64": [ "@actions/toolcache-ruby-ubuntu-1604-x64": [
"2.4", "2.5", "2.6", "2.7" "2.4", "2.5", "2.6", "2.7"
],
"@actions/toolcache-boost-ubuntu-1604-x64": [
"1.69", "1.72"
] ]
} }

3
images/linux/toolcache-1804.json
View File

@@ -1,8 +1,5 @@
{ {
"@actions/toolcache-ruby-ubuntu-1804-x64": [ "@actions/toolcache-ruby-ubuntu-1804-x64": [
"2.4", "2.5", "2.6", "2.7" "2.4", "2.5", "2.6", "2.7"
],
"@actions/toolcache-boost-ubuntu-1804-x64": [
"1.69", "1.72"
] ]
} }

11
images/linux/toolset-1604.json
View File

@@ -34,6 +34,17 @@
"12.*", "12.*",
"14.*" "14.*"
] ]
},
{
"name": "boost",
"url" : "https://raw.githubusercontent.com/actions/boost-versions/master/versions-manifest.json",
"platform" : "linux",
"platform_version": "16.04",
"arch": "x64",
"versions": [
"1.69.0",
"1.72.0"
]
} }
] ]
} }

11
images/linux/toolset-1804.json
View File

@@ -34,6 +34,17 @@
"12.*", "12.*",
"14.*" "14.*"
] ]
},
{
"name": "boost",
"url" : "https://raw.githubusercontent.com/actions/boost-versions/master/versions-manifest.json",
"platform" : "linux",
"platform_version": "18.04",
"arch": "x64",
"versions": [
"1.69.0",
"1.72.0"
]
} }
] ]
} }