Include python version in PyPy python-version output (actions#1110)

cdce8p · web-flow · commit 88ffd4d597d8 · 2025-07-21T14:01:05.000-05:00
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -95875,7 +95875,7 @@ function findPyPyVersion(versionSpec, architecture, updateEnvironment, checkLate
             core.addPath(pythonLocation);
             core.addPath(_binDir);
         }
-        core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
+        core.setOutput('python-version', `pypy${resolvedPythonVersion}-${resolvedPyPyVersion}`);
         core.setOutput('python-path', pythonPath);
         return { resolvedPyPyVersion, resolvedPythonVersion };
     });
diff --git a/src/find-pypy.ts b/src/find-pypy.ts
@@ -96,7 +96,10 @@ export async function findPyPyVersion(
     core.addPath(pythonLocation);
     core.addPath(_binDir);
   }
-  core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
+  core.setOutput(
+    'python-version',
+    `pypy${resolvedPythonVersion}-${resolvedPyPyVersion}`
+  );
   core.setOutput('python-path', pythonPath);
 
   return {resolvedPyPyVersion, resolvedPythonVersion};

Original file line number	Diff line number	Diff line change
`@@ -95875,7 +95875,7 @@ function findPyPyVersion(versionSpec, architecture, updateEnvironment, checkLate`
`95875`	`95875`	`core.addPath(pythonLocation);`
`95876`	`95876`	`core.addPath(_binDir);`
`95877`	`95877`	`}`
`95878`		`- core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);`
	`95878`	+ core.setOutput('python-version', `pypy${resolvedPythonVersion}-${resolvedPyPyVersion}`);
`95879`	`95879`	`core.setOutput('python-path', pythonPath);`
`95880`	`95880`	`return { resolvedPyPyVersion, resolvedPythonVersion };`
`95881`	`95881`	`});`