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

[macos] install gfortran-10 (#2186)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2020-12-03 18:40:19 +03:00
committed by GitHub
parent f0bafa3eae
commit d0dd391b70
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,3 +5,8 @@ brew install gcc@8
echo "Installing GCC@9 using homebrew..." echo "Installing GCC@9 using homebrew..."
brew install gcc@9 brew install gcc@9
# https://github.com/actions/virtual-environments/issues/1280
echo "Installing GCC@10 using homebrew..."
brew install gcc@10
rm $(which gfortran)

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

@@ -55,7 +55,7 @@ function Get-VcpkgVersion {
} }
function Get-GccVersion { function Get-GccVersion {
$versionList = @("8", "9") $versionList = @("8", "9", "10")
$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"
@@ -63,7 +63,7 @@ function Get-GccVersion {
} }
function Get-FortranVersion { function Get-FortranVersion {
$versionList = @("8", "9") $versionList = @("8", "9", "10")
$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"

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

@@ -327,7 +327,7 @@ Describe "Clang/LLVM" -Skip:($os.IsHighSierra) {
} }
Describe "Gcc" -Skip:($os.IsHighSierra) { Describe "Gcc" -Skip:($os.IsHighSierra) {
$testCases = @("8", "9") | ForEach-Object { @{GccVersion = $_} } $testCases = @("8", "9", "10") | ForEach-Object { @{GccVersion = $_} }
It "Gcc <GccVersion>" -TestCases $testCases { It "Gcc <GccVersion>" -TestCases $testCases {
param ( param (
@@ -339,7 +339,7 @@ Describe "Gcc" -Skip:($os.IsHighSierra) {
} }
Describe "Gfortran" -Skip:($os.IsHighSierra) { Describe "Gfortran" -Skip:($os.IsHighSierra) {
$testCases = @("8", "9") | ForEach-Object { @{GfortranVersion = $_} } $testCases = @("8", "9", "10") | ForEach-Object { @{GfortranVersion = $_} }
It "Gfortran <GfortranVersion>" -TestCases $testCases { It "Gfortran <GfortranVersion>" -TestCases $testCases {
param ( param (
@@ -348,6 +348,10 @@ Describe "Gfortran" -Skip:($os.IsHighSierra) {
"gfortran-$GfortranVersion --version" | Should -ReturnZeroExitCode "gfortran-$GfortranVersion --version" | Should -ReturnZeroExitCode
} }
It "Gfortran is not found in the default path" {
"$(which gfortran)" | Should -BeNullOrEmpty
}
} }
Describe "Screen Resolution" -Skip:($os.IsHighSierra) { Describe "Screen Resolution" -Skip:($os.IsHighSierra) {