diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 17d85660..60bca7ad 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -63,6 +63,7 @@ $packageManagementList = @( (Get-PipxVersion), (Get-BundlerVersion), (Get-CocoaPodsVersion), + (Get-CondaVersion), (Get-HomebrewVersion), (Get-NPMVersion), (Get-YarnVersion), @@ -73,18 +74,11 @@ $packageManagementList = @( (Get-VcpkgVersion) ) -if ($os.IsLessThanMonterey) { - $packageManagementList += @( - (Get-CondaVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) -if ($os.IsLessThanMonterey) { - $markdown += New-MDHeader "Environment variables" -Level 4 - $markdown += Build-PackageManagementEnvironmentTable | New-MDTable - $markdown += New-MDNewLine -} +$markdown += New-MDHeader "Environment variables" -Level 4 +$markdown += Build-PackageManagementEnvironmentTable | New-MDTable +$markdown += New-MDNewLine + # Project Management $markdown += New-MDHeader "Project Management" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index e4b980b0..ee63e982 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -200,6 +200,7 @@ "./provision/core/mongodb.sh", "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", + "./provision/core/miniconda.sh", "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 4a348e73..7e78b182 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" -Skip:($os.IsMonterey) { +Describe "Miniconda" { It "Conda" { Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda"