Skip to content

Commit

Permalink
[Windows] Remove hub utility (#8365)
Browse files Browse the repository at this point in the history
  • Loading branch information
vpolikarpov-akvelon authored Sep 26, 2023
1 parent f051521 commit 9f764f7
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 18 deletions.
5 changes: 0 additions & 5 deletions images/win/scripts/Installers/Install-Git.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ Update-SessionEnvironment

git config --system --add safe.directory "*"

# Install hub with --ignore-dependencies option to prevent the installation of the git package.
# See details in https://github.com/actions/runner-images/issues/2375
Choco-Install -PackageName hub -ArgumentList "--ignore-dependencies"

# Disable GCM machine-wide
[Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine)

Expand All @@ -50,4 +46,3 @@ ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> "C:\Program Files\Git\etc\ssh\ssh
ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"

Invoke-PesterTests -TestFile "Git"
Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Hub CLI"
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ if (Test-IsWin19) {
$cliTools.AddToolVersion("Cloud Foundry CLI", $(Get-CloudFoundryVersion))
}
$cliTools.AddToolVersion("GitHub CLI", $(Get-GHVersion))
$cliTools.AddToolVersion("Hub CLI", $(Get-HubVersion))

# Rust Tools
Initialize-RustEnvironment
Expand Down
6 changes: 0 additions & 6 deletions images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,6 @@ function Get-CloudFoundryVersion {
return $cfVersion
}

function Get-HubVersion {
($(hub version) | Select-String -Pattern "hub version") -match "hub version (?<version>\d+\.\d+\.\d+)" | Out-Null
$hubVersion = $Matches.Version
return $hubVersion
}

function Get-7zipVersion {
(7z | Out-String) -match "7-Zip (?<version>\d+\.\d+\.?\d*)" | Out-Null
$version = $Matches.Version
Expand Down
6 changes: 0 additions & 6 deletions images/win/scripts/Tests/CLI.Tools.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,3 @@ Describe "CloudFoundry CLI" -Skip:(Test-IsWin22) {
"cf --version" | Should -ReturnZeroExitCode
}
}

Describe "Hub CLI" {
It "hub is installed" {
"hub --version" | Should -ReturnZeroExitCode
}
}

0 comments on commit 9f764f7

Please sign in to comment.