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

Rename Google Cloud SDK to CLI (#8335)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-09-20 16:32:41 +02:00
committed by GitHub
parent efb0feba5e
commit 601b21b1a6
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -158,7 +158,7 @@ $cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion))
$cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion))
$cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion))
$cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion))
$cliTools.AddToolVersion("Google Cloud SDK", $(Get-GoogleCloudSDKVersion))
$cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion))
$cliTools.AddToolVersion("Hub CLI", $(Get-HubCliVersion))
$cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion))
$cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion))

2
images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -109,7 +109,7 @@ function Get-GitFTPVersion {
return $gitftpVersion
}
function Get-GoogleCloudSDKVersion {
function Get-GoogleCloudCLIVersion {
return (gcloud --version | Select-Object -First 1) | Take-OutputPart -Part 3
}

10
images/linux/scripts/installers/google-cloud-sdk.sh → images/linux/scripts/installers/google-cloud-cli.sh
View File

@@ -1,16 +1,16 @@
#!/bin/bash -e
################################################################################
## File: google-cloud-sdk.sh
## Desc: Installs the Google Cloud SDK
## File: google-cloud-cli.sh
## Desc: Installs the Google Cloud CLI
################################################################################
REPO_URL="https://packages.cloud.google.com/apt"
# Install the Google Cloud SDK
# Install the Google Cloud CLI
echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list
wget -qO- https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor > /usr/share/keyrings/cloud.google.gpg
apt-get update -y
apt-get install -y google-cloud-sdk
apt-get install -y google-cloud-cli
# remove apt
rm /etc/apt/sources.list.d/google-cloud-sdk.list
@@ -19,4 +19,4 @@ rm /usr/share/keyrings/cloud.google.gpg
# add repo to the apt-sources.txt
echo "google-cloud-sdk $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt
invoke_tests "CLI.Tools" "Google Cloud SDK"
invoke_tests "CLI.Tools" "Google Cloud CLI"

4
images/linux/scripts/tests/CLI.Tools.Tests.ps1
View File

@@ -41,8 +41,8 @@ Describe "GitHub CLI" {
}
}
Describe "Google Cloud SDK" {
It "Google Cloud SDK" {
Describe "Google Cloud CLI" {
It "Google Cloud CLI" {
"gcloud --version" | Should -ReturnZeroExitCode
}
}

2
images/linux/ubuntu2004.json
View File

@@ -218,7 +218,7 @@
"{{template_dir}}/scripts/installers/git.sh",
"{{template_dir}}/scripts/installers/github-cli.sh",
"{{template_dir}}/scripts/installers/google-chrome.sh",
"{{template_dir}}/scripts/installers/google-cloud-sdk.sh",
"{{template_dir}}/scripts/installers/google-cloud-cli.sh",
"{{template_dir}}/scripts/installers/haskell.sh",
"{{template_dir}}/scripts/installers/heroku.sh",
"{{template_dir}}/scripts/installers/hhvm.sh",

2
images/linux/ubuntu2204.pkr.hcl
View File

@@ -301,7 +301,7 @@ build {
"${path.root}/scripts/installers/git.sh",
"${path.root}/scripts/installers/github-cli.sh",
"${path.root}/scripts/installers/google-chrome.sh",
"${path.root}/scripts/installers/google-cloud-sdk.sh",
"${path.root}/scripts/installers/google-cloud-cli.sh",
"${path.root}/scripts/installers/haskell.sh",
"${path.root}/scripts/installers/heroku.sh",
"${path.root}/scripts/installers/java-tools.sh",

10
images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 → images/win/scripts/Installers/Install-GoogleCloudCLI.ps1
View File

@@ -1,11 +1,11 @@
################################################################################
## File: Install-GoogleCloudSDK.ps1
## Desc: Install Google Cloud SDK
## File: Install-GoogleCloudCLI.ps1
## Desc: Install Google Cloud CLI
################################################################################
# https://cloud.google.com/sdk/docs/downloads-interactive
$googleCloudSDKInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe"
$googleCloudCLIInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe"
$argumentList = @("/S", "/allusers", "/noreporting")
Install-Binary -Url $googleCloudSDKInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList
Install-Binary -Url $googleCloudCLIInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList
Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudSDK"
Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudCLI"

2
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -78,7 +78,7 @@ $tools.AddToolVersion("ghc", $(Get-GHCVersion))
$tools.AddToolVersion("Git", $(Get-GitVersion))
$tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion))
if (Test-IsWin19) {
$tools.AddToolVersion("Google Cloud SDK", $(Get-GoogleCloudSDKVersion))
$tools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion))
}
$tools.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion))
$tools.AddToolVersion("InnoSetup", $(Get-InnoSetupVersion))

2
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -262,7 +262,7 @@ function Get-StackVersion {
return $stackVersion
}
function Get-GoogleCloudSDKVersion {
function Get-GoogleCloudCLIVersion {
return (((cmd /c "gcloud --version") -match "Google Cloud SDK") -replace "Google Cloud SDK").Trim()
}

2
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -117,7 +117,7 @@ Describe "Mingw64" {
}
}
Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) {
Describe "GoogleCloudCLI" -Skip:(Test-IsWin22) {
It "<ToolName>" -TestCases @(
@{ ToolName = "bq" }
@{ ToolName = "gcloud" }

2
images/win/windows2019.json
View File

@@ -269,7 +269,7 @@
"{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1",
"{{ template_dir }}/scripts/Installers/Install-RootCA.ps1",
"{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1",
"{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1",
"{{ template_dir }}/scripts/Installers/Install-GoogleCloudCLI.ps1",
"{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1",
"{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1",
"{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1",