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

exclude R and virtualbox

Browse Source
This commit is contained in:
Aleksandr Chebotov
2020-09-22 12:12:44 +03:00
parent e691d6e33b
commit d0524e9381
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
images/macos/provision/core/commonutils.sh
View File

@@ -40,12 +40,19 @@ for package in ${binst_common_utils[@]}; do
done done
# brew cask install # brew cask install
bcask_common_utils=( if is_BigSur; then
bcask_common_utils=(
julia
vagrant
)
else
bcask_common_utils=(
julia julia
virtualbox virtualbox
vagrant vagrant
r r
) )
fi
for package in ${bcask_common_utils[@]}; do for package in ${bcask_common_utils[@]}; do
echo "Install $package" echo "Install $package"

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

@@ -55,6 +55,10 @@ if ( -not $os.IsHighSierra) {
$markdown += New-MDList -Style Unordered -NoNewLine -Lines $lines $markdown += New-MDList -Style Unordered -NoNewLine -Lines $lines
} }
if ($os.IsLessThanBigSur) {
$markdown += New-MDList -Style Unordered -Lines @(Get-RVersion) -NoNewLine
}
$markdown += New-MDList -Style Unordered -Lines @( $markdown += New-MDList -Style Unordered -Lines @(
"Node.js ${nodejsVersion}" "Node.js ${nodejsVersion}"
"NVM ${nvmVersion}" "NVM ${nvmVersion}"
@@ -63,7 +67,6 @@ $markdown += New-MDList -Style Unordered -Lines @(
$python3Version, $python3Version,
"Ruby ${rubyVersion}", "Ruby ${rubyVersion}",
(Get-DotnetVersionList), (Get-DotnetVersionList),
(Get-RVersion),
"Go ${goVersion}", "Go ${goVersion}",
"$phpVersion", "$phpVersion",
"$juliaVersion" "$juliaVersion"
@@ -139,7 +142,6 @@ $bazelVersion = Run-Command "bazel --version" | Take-Part -Part 0 -Delimiter "-"
$bazeliskVersion = Run-Command "bazelisk version" | Select-String "Bazelisk version:" | Take-Part -Part 1 -Delimiter ":" $bazeliskVersion = Run-Command "bazelisk version" | Select-String "Bazelisk version:" | Take-Part -Part 1 -Delimiter ":"
$packerVersion = Run-Command "packer --version" $packerVersion = Run-Command "packer --version"
$helmVersion = Run-Command "helm version --short" $helmVersion = Run-Command "helm version --short"
$vbox = Run-Command "vboxmanage -v"
$vagrant = Run-Command "vagrant -v" $vagrant = Run-Command "vagrant -v"
$mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3
$mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2 $mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2
@@ -177,8 +179,12 @@ if ($os.IsHigherThanMojave) {
$markdown += New-MDList -Lines "Newman $newmanVersion" -Style Unordered -NoNewLine $markdown += New-MDList -Lines "Newman $newmanVersion" -Style Unordered -NoNewLine
} }
if ($os.IsLessThanBigSur) { if ($os.IsLessThanBigSur) {
$vbox = Run-Command "vboxmanage -v"
$parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1 $parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1
$markdown += New-MDList -Lines $parallelVersion -Style Unordered $markdown += New-MDList -Style Unordered -Lines @(
$vbox
$parallelVersion
)
} }
$markdown += New-MDNewLine $markdown += New-MDNewLine

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

@@ -213,7 +213,7 @@ Describe "Common utilities" {
"helm version --short" | Should -ReturnZeroExitCode "helm version --short" | Should -ReturnZeroExitCode
} }
It "virtualbox" { It "virtualbox" -Skip:($os.IsBigSur) {
"vboxmanage -v" | Should -ReturnZeroExitCode "vboxmanage -v" | Should -ReturnZeroExitCode
} }