Skip to content

Commit

Permalink
Add pyton-version to setup PyPy output (#365)
Browse files Browse the repository at this point in the history
* Add pyton-version to setup PyPy output

* remove new line from pypy version

* Move setOutput to findPyPyVersion

* Resolve conflict: 2
  • Loading branch information
dsame committed Apr 4, 2022
1 parent 7885ec3 commit 7933d5a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions dist/setup/index.js
Expand Up @@ -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 };
});
}
Expand Down
1 change: 1 addition & 0 deletions src/find-pypy.ts
Expand Up @@ -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};
}
Expand Down

0 comments on commit 7933d5a

Please sign in to comment.