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

[Ubuntu] Add Go and Node to the toolcache on 24.04 (#9806)

Browse Source
This commit is contained in:
Erik Bershel
2024-05-08 11:33:11 +02:00
committed by GitHub
parent 584c7c0fef
commit 7781af869b
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -120,9 +120,7 @@ $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version))
$tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion))
$tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion))
$tools.AddToolVersion("Docker Server", $(Get-DockerServerVersion)) $tools.AddToolVersion("Docker Server", $(Get-DockerServerVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion))
$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion))
}
$tools.AddToolVersion("Git", $(Get-GitVersion)) $tools.AddToolVersion("Git", $(Get-GitVersion))
$tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) $tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion))
$tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion)) $tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion))
@@ -266,12 +264,14 @@ if (-not $(Test-IsUbuntu24)) {
} }
# Cached Tools # Cached Tools
$cachedTools = $installedSoftware.AddHeader("Cached Tools")
$cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+")
$cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+")
if (-not $(Test-IsUbuntu24)) { if (-not $(Test-IsUbuntu24)) {
$cachedTools = $installedSoftware.AddHeader("Cached Tools")
$cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+")
$cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+")
$cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+")
$cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") }
$cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+")
if (-not $(Test-IsUbuntu24)) {
$cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+")
} }

2
images/ubuntu/scripts/tests/Toolset.Tests.ps1
View File

@@ -1,4 +1,4 @@
Describe "Toolset" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { Describe "Toolset" {
$tools = (Get-ToolsetContent).toolcache $tools = (Get-ToolsetContent).toolcache
$toolsExecutables = @{ $toolsExecutables = @{

6
images/ubuntu/templates/ubuntu-24.04.pkr.hcl
View File

@@ -323,6 +323,12 @@ provisioner "shell" {
scripts = ["${path.root}/../scripts/build/install-docker.sh"] scripts = ["${path.root}/../scripts/build/install-docker.sh"]
} }
provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
scripts = ["${path.root}/../scripts/build/Install-Toolset.ps1", "${path.root}/../scripts/build/Configure-Toolset.ps1"]
}
provisioner "shell" { provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"

14
images/ubuntu/toolsets/toolset-2404.json
View File

@@ -22,15 +22,23 @@
"url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json",
"platform" : "linux", "platform" : "linux",
"arch": "x64", "arch": "x64",
"versions": [] "versions": [
"16.*",
"18.*",
"20.*"
]
}, },
{ {
"name": "go", "name": "go",
"url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json",
"arch": "x64", "arch": "x64",
"platform" : "linux", "platform" : "linux",
"versions": [], "versions": [
"default": "*" "1.20.*",
"1.21.*",
"1.22.*"
],
"default": "1.22.*"
}, },
{ {
"name": "Ruby", "name": "Ruby",