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

[ubuntu-24] Add nvm and gcloud cli (#10881)

Browse Source
This commit is contained in:
Shamil Mubarakshin
2024-11-01 11:16:08 +01:00
committed by GitHub
parent 2111b3e225
commit a29761eb60
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,9 +135,7 @@ $tools.AddToolVersion("Mercurial", $(Get-HGVersion))
$tools.AddToolVersion("Minikube", $(Get-MinikubeVersion)) $tools.AddToolVersion("Minikube", $(Get-MinikubeVersion))
$tools.AddToolVersion("n", $(Get-NVersion)) $tools.AddToolVersion("n", $(Get-NVersion))
$tools.AddToolVersion("Newman", $(Get-NewmanVersion)) $tools.AddToolVersion("Newman", $(Get-NewmanVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$tools.AddToolVersion("nvm", $(Get-NvmVersion)) $tools.AddToolVersion("nvm", $(Get-NvmVersion))
}
$tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion)) $tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion))
$tools.AddToolVersion("Packer", $(Get-PackerVersion)) $tools.AddToolVersion("Packer", $(Get-PackerVersion))
$tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) $tools.AddToolVersion("Parcel", $(Get-ParcelVersion))
@@ -170,8 +168,8 @@ $cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion))
$cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion)) $cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion))
$cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion))
$cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion)) $cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) $cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion)) $cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion))
$cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) $cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion))
$cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion)) $cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion))

2
images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1
View File

@@ -36,7 +36,7 @@ Describe "GitHub CLI" {
} }
} }
Describe "Google Cloud CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { Describe "Google Cloud CLI" {
It "Google Cloud CLI" { It "Google Cloud CLI" {
"gcloud --version" | Should -ReturnZeroExitCode "gcloud --version" | Should -ReturnZeroExitCode
} }

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

@@ -354,7 +354,7 @@ Describe "Containers" {
} }
Describe "nvm" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { Describe "nvm" {
It "nvm" { It "nvm" {
"source /etc/skel/.nvm/nvm.sh && nvm --version" | Should -ReturnZeroExitCode "source /etc/skel/.nvm/nvm.sh && nvm --version" | Should -ReturnZeroExitCode
} }

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

@@ -297,6 +297,7 @@ provisioner "shell" {
"${path.root}/../scripts/build/install-git-lfs.sh", "${path.root}/../scripts/build/install-git-lfs.sh",
"${path.root}/../scripts/build/install-github-cli.sh", "${path.root}/../scripts/build/install-github-cli.sh",
"${path.root}/../scripts/build/install-google-chrome.sh", "${path.root}/../scripts/build/install-google-chrome.sh",
"${path.root}/../scripts/build/install-google-cloud-cli.sh",
"${path.root}/../scripts/build/install-haskell.sh", "${path.root}/../scripts/build/install-haskell.sh",
"${path.root}/../scripts/build/install-java-tools.sh", "${path.root}/../scripts/build/install-java-tools.sh",
"${path.root}/../scripts/build/install-kubernetes-tools.sh", "${path.root}/../scripts/build/install-kubernetes-tools.sh",
@@ -304,6 +305,7 @@ provisioner "shell" {
"${path.root}/../scripts/build/install-kotlin.sh", "${path.root}/../scripts/build/install-kotlin.sh",
"${path.root}/../scripts/build/install-mysql.sh", "${path.root}/../scripts/build/install-mysql.sh",
"${path.root}/../scripts/build/install-nginx.sh", "${path.root}/../scripts/build/install-nginx.sh",
"${path.root}/../scripts/build/install-nvm.sh",
"${path.root}/../scripts/build/install-nodejs.sh", "${path.root}/../scripts/build/install-nodejs.sh",
"${path.root}/../scripts/build/install-bazel.sh", "${path.root}/../scripts/build/install-bazel.sh",
"${path.root}/../scripts/build/install-php.sh", "${path.root}/../scripts/build/install-php.sh",