[Ubuntu] Install gcc@12 from brew (#6258)

This commit is contained in:
Mikhail Koliada
2022-09-19 15:36:04 +02:00
committed by GitHub
parent 518f5407fa
commit 3fab712c1e
5 changed files with 37 additions and 8 deletions

View File

@@ -27,6 +27,12 @@ echo "Validate the installation reloading /etc/environment"
reloadEtcEnvironment reloadEtcEnvironment
# Install additional brew packages # Install additional brew packages
# brew GCC installation needed because the default Ubuntu components
# are too old for current brew software
# See:
# https://github.com/Homebrew/homebrew-core/issues/110877
brew_packages=$(get_toolset_value .brew[].name) brew_packages=$(get_toolset_value .brew[].name)
for package in $brew_packages; do for package in $brew_packages; do
echo "Install $package" echo "Install $package"

View File

@@ -257,16 +257,22 @@ Describe "HHVM" -Skip:(Test-IsUbuntu22) {
} }
Describe "Homebrew" { Describe "Homebrew" {
$brewToolset = (Get-ToolsetContent).brew
$testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} }
It "homebrew" { It "homebrew" {
"brew --version" | Should -ReturnZeroExitCode "brew --version" | Should -ReturnZeroExitCode
} }
Context "Packages" { It "zstd has /usr/local/bin symlink" {
$testCases = (Get-ToolsetContent).brew | ForEach-Object { @{ ToolName = $_.name } } "/usr/local/bin/zstd" | Should -Exist
}
It "<ToolName>" -TestCases $testCases { It "homebrew package <brewName>" -TestCases $testCases {
"$ToolName --version" | Should -Not -BeNullOrEmpty $brewPrefix = brew --prefix $brewName
} $brewPackage = Join-Path $brewPrefix "bin" $brewCommand
"$brewPackage --version" | Should -ReturnZeroExitCode
} }
} }

View File

@@ -217,7 +217,14 @@
] ]
}, },
"brew": [ "brew": [
{"name": "zstd"} {
"name": "gcc@12",
"command": "gcc-12"
},
{
"name": "zstd",
"command": "zstd"
}
], ],
"docker": { "docker": {
"images": [ "images": [

View File

@@ -217,7 +217,14 @@
] ]
}, },
"brew": [ "brew": [
{"name": "zstd"} {
"name": "gcc@12",
"command": "gcc-12"
},
{
"name": "zstd",
"command": "zstd"
}
], ],
"docker": { "docker": {
"images": [ "images": [

View File

@@ -201,7 +201,10 @@
] ]
}, },
"brew": [ "brew": [
{"name": "zstd"} {
"name": "zstd",
"command": "zstd"
}
], ],
"docker": { "docker": {
"images": [ "images": [