diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 93154dfd8..47a2c7c17 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -48,14 +48,9 @@ $languageAndRuntimeList = @( (Get-ClangLLVMVersion) (Get-GccVersion) (Get-FortranVersion) + (Get-RVersion) ) -if ($os.IsCatalina) { - $languageAndRuntimeList += @( - (Get-RVersion) - ) -} - # 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) diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index bc6845117..96d4f6e81 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -150,7 +150,7 @@ Describe "xctool" -Skip:($os.IsHigherThanCatalina) { } } -Describe "R" -Skip:($os.IsHigherThanCatalina) { +Describe "R" { It "R" { "R --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e602f81c0..e1b5fdda2 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -194,7 +194,8 @@ "zstd", "zlib", "libxext", - "libxft" + "libxft", + "r" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index f6c8c1f15..198e4cbed 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -110,7 +110,8 @@ "gmp", "zlib", "libxext", - "libxft" + "libxft", + "r" ], "cask_packages": [ "julia"