actions/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2025-04-24 15:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Move setOutput to findPyPyVersion

Browse source
This commit is contained in:
Sergey Dolin 2022-04-03 00:32:02 +05:00
parent f62decb260
commit 19fb37dbea
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/setup/index.js vendored
View file

@ -2080,6 +2080,7 @@ function findPyPyVersion(versionSpec, architecture) {
core.exportVariable('pythonLocation', pythonLocation); core.exportVariable('pythonLocation', pythonLocation);
core.addPath(pythonLocation); core.addPath(pythonLocation);
core.addPath(_binDir); core.addPath(_binDir);
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
return { resolvedPyPyVersion, resolvedPythonVersion }; return { resolvedPyPyVersion, resolvedPythonVersion };
}); });
} }
@ -2105,7 +2106,6 @@ function findPyPyToolCache(pythonVersion, pypyVersion, architecture) {
if (!installDir) { if (!installDir) {
core.info(`PyPy version ${pythonVersion} (${pypyVersion}) was not found in the local cache`); core.info(`PyPy version ${pythonVersion} (${pypyVersion}) was not found in the local cache`);
} }
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
return { installDir, resolvedPythonVersion, resolvedPyPyVersion }; return { installDir, resolvedPythonVersion, resolvedPyPyVersion };
} }
exports.findPyPyToolCache = findPyPyToolCache; exports.findPyPyToolCache = findPyPyToolCache;

2
src/find-pypy.ts
View file

@ -52,6 +52,7 @@ export async function findPyPyVersion(
core.exportVariable('pythonLocation', pythonLocation); core.exportVariable('pythonLocation', pythonLocation);
core.addPath(pythonLocation); core.addPath(pythonLocation);
core.addPath(_binDir); core.addPath(_binDir);
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
return {resolvedPyPyVersion, resolvedPythonVersion}; return {resolvedPyPyVersion, resolvedPythonVersion};
} }
@ -90,7 +91,6 @@ export function findPyPyToolCache(
); );
} }
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
return {installDir, resolvedPythonVersion, resolvedPyPyVersion}; return {installDir, resolvedPythonVersion, resolvedPyPyVersion};
} }