From 88ffd4d597d830d67a7369dd33dcb72c0958a807 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Mon, 21 Jul 2025 21:01:05 +0200
Subject: [PATCH] Include python version in PyPy python-version output (#1110)

---
 dist/setup/index.js | 2 +-
 src/find-pypy.ts    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index f8c5d4e7..a6cebf56 100644
--- 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
index 9807878a..d15ebf60 100644
--- 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};