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] do not add homebrew to $PATH (#6240)

Browse Source
This commit is contained in:
Mikhail Koliada
2022-09-22 18:07:12 +02:00
committed by GitHub
parent 641fd77b4e
commit 9efcd841b9
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ function Get-LernaVersion {
} }
function Get-HomebrewVersion { function Get-HomebrewVersion {
$result = Get-CommandResult "brew -v" $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v"
$result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null $result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null
$version = $Matches.version $version = $Matches.version
return "Homebrew $version" return "Homebrew $version"

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

@@ -84,6 +84,18 @@ $packageManagementList = @(
) )
$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object)
$markdown += New-MDHeader "Notes:" -Level 5
$reportHomebrew = @'
```
Location: /home/linuxbrew
Note: Homebrew is pre-installed on image but not added to PATH.
run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv) command
to accomplish this.
```
'@
$markdown += New-MDParagraph -Lines $reportHomebrew
$markdown += New-MDHeader "Environment variables" -Level 4 $markdown += New-MDHeader "Environment variables" -Level 4
$markdown += Build-PackageManagementEnvironmentTable | New-MDTable $markdown += Build-PackageManagementEnvironmentTable | New-MDTable
$markdown += New-MDNewLine $markdown += New-MDNewLine

10
images/linux/scripts/installers/homebrew.sh
View File

@@ -11,14 +11,10 @@ source $HELPER_SCRIPTS/install.sh
# Install the Homebrew on Linux # Install the Homebrew on Linux
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
brew_shellenv="/home/linuxbrew/.linuxbrew/bin/brew shellenv"
# Update /etc/environment # Invoke shellenv to make brew available during runnig session
## Put HOMEBREW_* variables. eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
$brew_shellenv | grep 'export HOMEBREW' | sed -E 's/^export (.*);$/\1/' | tr -d '"' | sudo tee -a /etc/environment
# add brew executables locations to PATH
brew_path=$($brew_shellenv | grep '^export PATH' | sed -E 's/^export PATH="([^$]+)\$.*/\1/')
prependEtcEnvironmentPath "$brew_path"
setEtcEnvironmentVariable HOMEBREW_NO_AUTO_UPDATE 1 setEtcEnvironmentVariable HOMEBREW_NO_AUTO_UPDATE 1
setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650

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

@@ -261,7 +261,7 @@ Describe "Homebrew" {
$testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} } $testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} }
It "homebrew" { It "homebrew" {
"brew --version" | Should -ReturnZeroExitCode "/home/linuxbrew/.linuxbrew/bin/brew --version" | Should -ReturnZeroExitCode
} }
It "zstd has /usr/local/bin symlink" { It "zstd has /usr/local/bin symlink" {
@@ -269,7 +269,7 @@ Describe "Homebrew" {
} }
It "homebrew package <brewName>" -TestCases $testCases { It "homebrew package <brewName>" -TestCases $testCases {
$brewPrefix = brew --prefix $brewName $brewPrefix = /home/linuxbrew/.linuxbrew/bin/brew --prefix $brewName
$brewPackage = Join-Path $brewPrefix "bin" $brewCommand $brewPackage = Join-Path $brewPrefix "bin" $brewCommand
"$brewPackage --version" | Should -ReturnZeroExitCode "$brewPackage --version" | Should -ReturnZeroExitCode