diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index bd2a14431..e98a96df1 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -163,6 +163,11 @@ function Get-NodeVersion { return "Node.js $nodeVersion" } +function Get-PerlVersion { + $version = Run-Command "perl -e 'print substr(`$^V,1)'" + return "Perl $version" +} + function Get-PythonVersion { $pythonVersion = Run-Command "python --version" return $pythonVersion diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index dacf185f0..6cbb986e4 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -34,6 +34,7 @@ $languageAndRuntimeList = @( (Get-NodeVersion), (Get-NVMVersion), (Get-NVMNodeVersionList), + (Get-PerlVersion), (Get-PythonVersion), (Get-Python3Version), (Get-RubyVersion), diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index e68ab94d7..70efa155b 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -81,6 +81,10 @@ Describe "CommonUtils" { "packer --version" | Should -ReturnZeroExitCode } + It "Perl" { + "perl -e 'print substr($^V,1)'" | Should -ReturnZeroExitCode + } + It "Helm" { "helm version --short" | Should -ReturnZeroExitCode } @@ -121,10 +125,6 @@ Describe "CommonUtils" { "julia --version" | Should -ReturnZeroExitCode } - It "virtualbox" -Skip:($os.IsBigSur) { - "vboxmanage -v" | Should -ReturnZeroExitCode - } - It "jq" { "jq --version" | Should -ReturnZeroExitCode } @@ -141,6 +141,10 @@ Describe "CommonUtils" { "vagrant --version" | Should -ReturnZeroExitCode } + It "virtualbox" -Skip:($os.IsBigSur) { + "vboxmanage -v" | Should -ReturnZeroExitCode + } + It "xctool" -Skip:($os.IsBigSur) { "xctool --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json index 71134939a..a25add4f4 100644 --- a/images/macos/toolsets/toolset-10.13.json +++ b/images/macos/toolsets/toolset-10.13.json @@ -203,32 +203,33 @@ ], "brew": { "common_packages": [ - "carthage", - "cmake", - "subversion", - "go", - "gnupg", - "llvm", - "libpq", - "zstd", - "packer", - "helm", "aliyun-cli", - "bazelisk", - "gh", - "p7zip", "ant", "aria2", - "gnu-tar", - "xctool", "bats", - "parallel" + "bazelisk", + "carthage", + "cmake", + "gh", + "gnupg", + "gnu-tar", + "go", + "helm", + "libpq", + "llvm", + "p7zip", + "packer", + "parallel", + "perl", + "subversion", + "xctool", + "zstd" ], "cask_packages": [ "julia", - "virtualbox", + "r", "vagrant", - "r" + "virtualbox" ] }, "toolcache": [ diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 43102f861..e82682e66 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -226,32 +226,33 @@ ], "brew": { "common_packages": [ - "carthage", - "cmake", - "subversion", - "go", - "gnupg", - "llvm", - "libpq", - "zstd", - "packer", - "helm", "aliyun-cli", - "bazelisk", - "gh", - "p7zip", "ant", "aria2", - "gnu-tar", - "xctool", "bats", - "parallel" + "bazelisk", + "carthage", + "cmake", + "gh", + "gnupg", + "gnu-tar", + "go", + "helm", + "libpq", + "llvm", + "p7zip", + "packer", + "parallel", + "perl", + "subversion", + "xctool", + "zstd" ], "cask_packages": [ "julia", - "virtualbox", + "r", "vagrant", - "r" + "virtualbox" ] }, "toolcache": [ diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 294b9d1eb..ebc0c83c3 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -163,32 +163,33 @@ ], "brew": { "common_packages": [ - "carthage", - "cmake", - "subversion", - "go", - "gnupg", - "llvm", - "libpq", - "zstd", - "packer", - "helm", "aliyun-cli", - "bazelisk", - "gh", - "p7zip", "ant", "aria2", - "gnu-tar", - "xctool", "bats", - "parallel" + "bazelisk", + "carthage", + "cmake", + "gh", + "gnupg", + "gnu-tar", + "go", + "helm", + "libpq", + "llvm", + "p7zip", + "packer", + "parallel", + "perl", + "subversion", + "xctool", + "zstd" ], "cask_packages": [ "julia", - "virtualbox", + "r", "vagrant", - "r" + "virtualbox" ] }, "toolcache": [ diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 930683d71..89b5785b9 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -96,23 +96,24 @@ ], "brew": { "common_packages": [ - "carthage", - "cmake", - "subversion", - "go", - "gnupg", - "llvm", - "libpq", - "zstd", - "packer", - "helm", "aliyun-cli", - "bazelisk", - "gh", - "p7zip", "ant", "aria2", - "gnu-tar" + "bazelisk", + "carthage", + "cmake", + "gh", + "gnupg", + "gnu-tar", + "go", + "helm", + "libpq", + "llvm", + "p7zip", + "packer", + "perl", + "subversion", + "zstd" ], "cask_packages": [ "julia"