Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[macOS] Add PyPy to Big Sur image #3524

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions images/macos/software-report/SoftwareReport.Toolcache.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@ function Build-ToolcacheSection {
$output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered
$output += New-MDHeader "Python" -Level 4
$output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered

if ($os.IsLessThanBigSur) {
$output += New-MDHeader "PyPy" -Level 4
$output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered
}
$output += New-MDHeader "PyPy" -Level 4
$output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered

if( -not $os.IsHighSierra) {
$output += New-MDHeader "Node.js" -Level 4
Expand Down
1 change: 1 addition & 0 deletions images/macos/templates/macOS-11.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
"./provision/core/chrome.sh",
"./provision/core/edge.sh",
"./provision/core/firefox.sh",
"./provision/core/pypy.sh",
"./provision/core/pipx-packages.sh"
]
},
Expand Down
2 changes: 1 addition & 1 deletion images/macos/tests/Toolcache.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Describe "Toolcache" {
}
}
}
Context "PyPy" -Skip:($os.IsBigSur) {
Context "PyPy" {
$pypyDirectory = Join-Path $toolcacheDirectory "PyPy"
$pypyPackage = $packages | Where-Object { $_.ToolName -eq "pypy" } | Select-Object -First 1
$testCase = @{ PypyDirectory = $pypyDirectory }
Expand Down
9 changes: 9 additions & 0 deletions images/macos/toolsets/toolset-11.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,15 @@
"3.9.*"
]
},
{
"name": "PyPy",
"arch": "x64",
"platform" : "darwin",
"versions": [
"2.7",
"3.7"
]
},
{
"name": "Node",
"url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json",
Expand Down