Find PyPy in tool cache (#268)

PyO3 · May 13, 2024 · e08d83f · e08d83f
1 parent 512e88b
commit e08d83f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -11951,7 +11951,7 @@ async function installRustTarget(target, toolchain) {
     }
 }
 async function addToolCachePythonVersionsToPath() {
-    const allPythonVersions = tc.findAllVersions('python');
+    const allPythonVersions = tc.findAllVersions('Python');
     for (const ver of allPythonVersions) {
         const installDir = tc.find('Python', ver);
         if (installDir) {
@@ -11960,6 +11960,15 @@ async function addToolCachePythonVersionsToPath() {
             core.addPath(path.join(installDir, 'bin'));
         }
     }
+    const allPyPyVersions = tc.findAllVersions('PyPy');
+    for (const ver of allPyPyVersions) {
+        const installDir = tc.find('PyPy', ver);
+        if (installDir) {
+            core.info(`Python version ${ver} was found in the local cache`);
+            core.addPath(installDir);
+            core.addPath(path.join(installDir, 'bin'));
+        }
+    }
 }
 function setupSccacheEnv() {
     core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');

diff --git a/src/index.ts b/src/index.ts
@@ -767,7 +767,7 @@ async function installRustTarget(
 }
 
 async function addToolCachePythonVersionsToPath(): Promise<void> {
-  const allPythonVersions = tc.findAllVersions('python')
+  const allPythonVersions = tc.findAllVersions('Python')
   for (const ver of allPythonVersions) {
     const installDir = tc.find('Python', ver)
     if (installDir) {
@@ -776,6 +776,15 @@ async function addToolCachePythonVersionsToPath(): Promise<void> {
       core.addPath(path.join(installDir, 'bin'))
     }
   }
+  const allPyPyVersions = tc.findAllVersions('PyPy')
+  for (const ver of allPyPyVersions) {
+    const installDir = tc.find('PyPy', ver)
+    if (installDir) {
+      core.info(`Python version ${ver} was found in the local cache`)
+      core.addPath(installDir)
+      core.addPath(path.join(installDir, 'bin'))
+    }
+  }
 }
 
 function setupSccacheEnv(): void {