added Scripts to PATH on Windows (#173)

Co-authored-by: Nikita Bykov <v-nibyko@microsoft.com>
actions · Dec 18, 2020 · 152ba7c · 152ba7c
1 parent da8703f
commit 152ba7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -6437,6 +6437,10 @@ function usePyPy(majorVersion, architecture) {
     core.exportVariable('pythonLocation', pythonLocation);
     core.addPath(installDir);
     core.addPath(_binDir);
+    // Starting from PyPy 7.3.1, the folder that is used for pip and anything that pip installs should be "Scripts" on Windows.
+    if (IS_WINDOWS) {
+        core.addPath(path.join(installDir, 'Scripts'));
+    }
     const impl = 'pypy' + majorVersion.toString();
     core.setOutput('python-version', impl);
     return { impl: impl, version: versionFromPath(installDir) };
@@ -6515,6 +6519,7 @@ function findPythonVersion(version, architecture) {
             case 'PYPY2':
                 return usePyPy('2', architecture);
             case 'PYPY3':
+                // keep pypy3 pointing to 3.6 for backward compatibility
                 return usePyPy('3.6', architecture);
             default:
                 return yield useCpythonVersion(version, architecture);

diff --git a/src/find-python.ts b/src/find-python.ts
@@ -80,6 +80,10 @@ function usePyPy(
 
   core.addPath(installDir);
   core.addPath(_binDir);
+  // Starting from PyPy 7.3.1, the folder that is used for pip and anything that pip installs should be "Scripts" on Windows.
+  if (IS_WINDOWS) {
+    core.addPath(path.join(installDir, 'Scripts'));
+  }
 
   const impl = 'pypy' + majorVersion.toString();
   core.setOutput('python-version', impl);