actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add miniconda to macOS 12 (#5693)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2022-06-06 14:39:50 +02:00
committed by GitHub
parent 787d6f6ee7
commit f380cc1031
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ $packageManagementList = @(
(Get-PipxVersion), (Get-PipxVersion),
(Get-BundlerVersion), (Get-BundlerVersion),
(Get-CocoaPodsVersion), (Get-CocoaPodsVersion),
(Get-CondaVersion),
(Get-HomebrewVersion), (Get-HomebrewVersion),
(Get-NPMVersion), (Get-NPMVersion),
(Get-YarnVersion), (Get-YarnVersion),
@@ -73,18 +74,11 @@ $packageManagementList = @(
(Get-VcpkgVersion) (Get-VcpkgVersion)
) )
if ($os.IsLessThanMonterey) {
$packageManagementList += @(
(Get-CondaVersion)
)
}
$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object)
if ($os.IsLessThanMonterey) { $markdown += New-MDHeader "Environment variables" -Level 4
$markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-PackageManagementEnvironmentTable | New-MDTable
$markdown += Build-PackageManagementEnvironmentTable | New-MDTable $markdown += New-MDNewLine
$markdown += New-MDNewLine
}
# Project Management # Project Management
$markdown += New-MDHeader "Project Management" -Level 3 $markdown += New-MDHeader "Project Management" -Level 3
$markdown += New-MDList -Style Unordered -Lines (@( $markdown += New-MDList -Style Unordered -Lines (@(

1
images/macos/templates/macOS-12.json
View File

@@ -200,6 +200,7 @@
"./provision/core/mongodb.sh", "./provision/core/mongodb.sh",
"./provision/core/audiodevice.sh", "./provision/core/audiodevice.sh",
"./provision/core/vcpkg.sh", "./provision/core/vcpkg.sh",
"./provision/core/miniconda.sh",
"./provision/core/safari.sh", "./provision/core/safari.sh",
"./provision/core/chrome.sh", "./provision/core/chrome.sh",
"./provision/core/edge.sh", "./provision/core/edge.sh",

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

@@ -58,7 +58,7 @@ Describe "AzCopy" {
} }
} }
Describe "Miniconda" -Skip:($os.IsMonterey) { Describe "Miniconda" {
It "Conda" { It "Conda" {
Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty
$condaBinPath = Join-Path $env:CONDA "bin" "conda" $condaBinPath = Join-Path $env:CONDA "bin" "conda"