Add pyton-version to setup PyPy output (actions#365)

dsame · web-flow · commit 7933d5a3dd71 · 2022-04-04T13:12:56.000-04:00
* Add pyton-version to setup PyPy output

* remove new line from pypy version

* Move setOutput to findPyPyVersion

* Resolve conflict: 2
diff --git 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
@@ -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};
 }

Original file line number	Diff line number	Diff line change
`@@ -52347,6 +52347,7 @@ function findPyPyVersion(versionSpec, architecture) {`
`52347`	`52347`	`core.exportVariable('pythonLocation', pythonLocation);`
`52348`	`52348`	`core.addPath(pythonLocation);`
`52349`	`52349`	`core.addPath(_binDir);`
	`52350`	`+ core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());`
`52350`	`52351`	`return { resolvedPyPyVersion, resolvedPythonVersion };`
`52351`	`52352`	`});`
`52352`	`52353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ export async function findPyPyVersion(`
`52`	`52`	`core.exportVariable('pythonLocation', pythonLocation);`
`53`	`53`	`core.addPath(pythonLocation);`
`54`	`54`	`core.addPath(_binDir);`
	`55`	`+ core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());`
`55`	`56`
`56`	`57`	`return {resolvedPyPyVersion, resolvedPythonVersion};`
`57`	`58`	`}`