Made env.var pythonLocation consistent for Python and PyPy (#418) · actions/setup-python@f72db17 (original) (raw)

3 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -151,6 +151,8 @@ jobs:
151 151 - run: pipx run --python '${{ steps.cp310.outputs.python-path }}' nox --version
152 152 ```
153 153
154 +>The environment variable `pythonLocation` also becomes available after Python or PyPy installation. It contains the absolute path to the folder where the desired version of Python or PyPy is installed.
155 +
154 156 # Getting started with Python + Actions
155 157
156 158 Check out our detailed guide on using [Python with GitHub Actions](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-python-with-github-actions).
Original file line number Diff line number Diff line change
@@ -63993,7 +63993,7 @@ function findPyPyVersion(versionSpec, architecture) {
63993 63993 const binaryExtension = utils_1.IS_WINDOWS ? '.exe' : '';
63994 63994 const pythonPath = path.join(utils_1.IS_WINDOWS ? installDir : _binDir, `python${binaryExtension}`);
63995 63995 const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
63996 - core.exportVariable('pythonLocation', pythonLocation);
63996 + core.exportVariable('pythonLocation', installDir);
63997 63997 core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
63998 63998 core.addPath(pythonLocation);
63999 63999 core.addPath(_binDir);
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ export async function findPyPyVersion(
54 54 `python${binaryExtension}`
55 55 );
56 56 const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
57 -core.exportVariable('pythonLocation', pythonLocation);
57 +core.exportVariable('pythonLocation', installDir);
58 58 core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
59 59 core.addPath(pythonLocation);
60 60 core.addPath(_binDir);