mirror of
https://github.com/actions/setup-python.git
synced 2024-11-05 23:45:49 -05:00
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
This commit is contained in:
parent
7885ec3539
commit
7933d5a3dd
2 changed files with 2 additions and 0 deletions
1
dist/setup/index.js
vendored
1
dist/setup/index.js
vendored
|
@ -52347,6 +52347,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 };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -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};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue