actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MacOS] Add R to macOS images (#4996)

Browse Source 
* Add R to macOS images

* Remove redundant already existing functions and tests
This commit is contained in:
Maksim Shilov
2022-02-04 21:00:07 +03:00
committed by GitHub
parent b53758f5a5
commit c01e7d1ed8
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,13 +48,8 @@ $languageAndRuntimeList = @(
(Get-ClangLLVMVersion) (Get-ClangLLVMVersion)
(Get-GccVersion) (Get-GccVersion)
(Get-FortranVersion) (Get-FortranVersion)
)
if ($os.IsCatalina) {
$languageAndRuntimeList += @(
(Get-RVersion) (Get-RVersion)
) )
}
# To sort GCC and Gfortran correctly, we need to use natural sort https://gist.github.com/markwragg/e2a9dc05f3464103d6998298fb575d4e#file-sort-natural-ps1 # 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) }) } $toNatural = { [regex]::Replace($_, '\d+', { $args[0].Value.PadLeft(20) }) }

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

@@ -150,7 +150,7 @@ Describe "xctool" -Skip:($os.IsHigherThanCatalina) {
} }
} }
Describe "R" -Skip:($os.IsHigherThanCatalina) { Describe "R" {
It "R" { It "R" {
"R --version" | Should -ReturnZeroExitCode "R --version" | Should -ReturnZeroExitCode
} }

3
images/macos/toolsets/toolset-11.json
View File

@@ -194,7 +194,8 @@
"zstd", "zstd",
"zlib", "zlib",
"libxext", "libxext",
"libxft" "libxft",
"r"
], ],
"cask_packages": [ "cask_packages": [
"julia" "julia"

3
images/macos/toolsets/toolset-12.json
View File

@@ -110,7 +110,8 @@
"gmp", "gmp",
"zlib", "zlib",
"libxext", "libxext",
"libxft" "libxft",
"r"
], ],
"cask_packages": [ "cask_packages": [
"julia" "julia"