actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-18 07:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Add GCC 11 (#3361)

Browse Source 
* Add gcc@11 to macOS images

* Change tests and software report to use gcc toolset versions

* Add natural sort
This commit is contained in:
Mikhail Timofeev
2021-05-13 11:45:33 +03:00
committed by GitHub
parent 3b20fa31db
commit 0f3523c0af
7 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
images/macos/provision/core/gcc.sh
View File

@@ -1,15 +1,16 @@
#!/bin/bash -e -o pipefail #!/bin/bash -e -o pipefail
source ~/utils/utils.sh source ~/utils/utils.sh
echo "Installing GCC@8 using homebrew..." gccVersions=$(get_toolset_value '.gcc.versions | .[]')
brew_smart_install "gcc@8"
echo "Installing GCC@9 using homebrew..." for gccVersion in $gccVersions; do
brew_smart_install "gcc@9" brew_smart_install "gcc@${gccVersion}"
done
# https://github.com/actions/virtual-environments/issues/1280 # Delete default gfortran link if it exists https://github.com/actions/virtual-environments/issues/1280
echo "Installing GCC@10 using homebrew..." gfortranPath=$(which gfortran)
brew_smart_install "gcc@10" if [ $gfortranPath ]; then
rm $(which gfortran) rm $gfortranPath
fi
invoke_tests "Common" "GCC" invoke_tests "Common" "GCC"

6
images/macos/software-report/SoftwareReport.Common.psm1
View File

@@ -80,7 +80,7 @@ function Get-VcpkgVersion {
} }
function Get-GccVersion { function Get-GccVersion {
$versionList = @("8", "9", "10") $versionList = Get-ToolsetValue -KeyPath gcc.versions
$versionList | Foreach-Object { $versionList | Foreach-Object {
$version = Run-Command "gcc-${_} --version" | Select-Object -First 1 $version = Run-Command "gcc-${_} --version" | Select-Object -First 1
"$version - available by ``gcc-${_}`` alias" "$version - available by ``gcc-${_}`` alias"
@@ -88,10 +88,10 @@ function Get-GccVersion {
} }
function Get-FortranVersion { function Get-FortranVersion {
$versionList = @("8", "9", "10") $versionList = Get-ToolsetValue -KeyPath gcc.versions
$versionList | Foreach-Object { $versionList | Foreach-Object {
$version = Run-Command "gfortran-${_} --version" | Select-Object -First 1 $version = Run-Command "gfortran-${_} --version" | Select-Object -First 1
"$version - available by ``gfortran-${_}`` alias" "$version - available by ``gfortran-${_}`` alias"
} }
} }

4
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -60,7 +60,9 @@ if ($os.IsLessThanBigSur) {
) )
} }
$markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object) # To sort GCC and Gfortran correctly, we need to use natural sort https://gist.github.com/markwragg/e2a9dc05f3464103d6998298fb575d4e#file-sort-natural-ps1
$toNatural = { [regex]::Replace($_, '\d+', { $args[0].Value.PadLeft(20) }) }
$markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object $toNatural)
# Package Management # Package Management
$markdown += New-MDHeader "Package Management" -Level 3 $markdown += New-MDHeader "Package Management" -Level 3

2
images/macos/tests/Common.Tests.ps1
View File

@@ -10,7 +10,7 @@ Describe ".NET" {
} }
Describe "GCC" -Skip:($os.IsHighSierra) { Describe "GCC" -Skip:($os.IsHighSierra) {
$testCases = @("8", "9", "10") | ForEach-Object { @{Version = $_} } $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} }
It "GCC <Version>" -TestCases $testCases { It "GCC <Version>" -TestCases $testCases {
param ( param (

8
images/macos/toolsets/toolset-10.14.json
View File

@@ -263,6 +263,14 @@
"virtualbox" "virtualbox"
] ]
}, },
"gcc": {
"versions": [
"8",
"9",
"10",
"11"
]
},
"toolcache": [ "toolcache": [
{ {
"name": "Python", "name": "Python",

8
images/macos/toolsets/toolset-10.15.json
View File

@@ -222,6 +222,14 @@
"virtualbox" "virtualbox"
] ]
}, },
"gcc": {
"versions": [
"8",
"9",
"10",
"11"
]
},
"toolcache": [ "toolcache": [
{ {
"name": "Python", "name": "Python",

8
images/macos/toolsets/toolset-11.0.json
View File

@@ -150,6 +150,14 @@
"julia" "julia"
] ]
}, },
"gcc": {
"versions": [
"8",
"9",
"10",
"11"
]
},
"toolcache": [ "toolcache": [
{ {
"name": "Python", "name": "Python",