[macOS] Get back pypy to big sur (actions#3524)

dmitry-shibanov · Jun 6, 2021 · 46ced60 · 46ced60
1 parent 3fbceba
commit 46ced60
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1
@@ -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

diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json
@@ -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"
             ]
         },

diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1
@@ -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 }

diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
@@ -176,6 +176,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",