From 7933d5a3dd7112211f44c3c6d4c1156a64d3f5bf Mon Sep 17 00:00:00 2001
From: Sergey Dolin <sergey.dolin@gmail.com>
Date: Mon, 4 Apr 2022 22:12:56 +0500
Subject: [PATCH] Add pyton-version to setup PyPy output (#365)

* Add pyton-version to setup PyPy output

* remove new line from pypy version

* Move setOutput to findPyPyVersion

* Resolve conflict: 2
---
 dist/setup/index.js | 1 +
 src/find-pypy.ts    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 1c8512e0..d272c828 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -52347,6 +52347,7 @@ function findPyPyVersion(versionSpec, architecture) {
         core.exportVariable('pythonLocation', pythonLocation);
         core.addPath(pythonLocation);
         core.addPath(_binDir);
+        core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
         return { resolvedPyPyVersion, resolvedPythonVersion };
     });
 }
diff --git a/src/find-pypy.ts b/src/find-pypy.ts
index eb8dfac6..75b6abb0 100644
--- a/src/find-pypy.ts
+++ b/src/find-pypy.ts
@@ -52,6 +52,7 @@ export async function findPyPyVersion(
   core.exportVariable('pythonLocation', pythonLocation);
   core.addPath(pythonLocation);
   core.addPath(_binDir);
+  core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
 
   return {resolvedPyPyVersion, resolvedPythonVersion};
 }