Skip to content

Commit

Permalink
Made env.var pythonLocation consistent for Python and PyPy (#418)
Browse files Browse the repository at this point in the history
* Change find-pypy.ts to redefine pythonLocaction environment variable

* Change README.md in order to add sentence about pythonLocation envvar

* Change sentence about pythonLocation envvar in README.md

* Rephrase the definition of pythonLocation env.var
  • Loading branch information
IvanZosimov committed Jun 8, 2022
1 parent 53e1529 commit f72db17
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -151,6 +151,8 @@ jobs:
- run: pipx run --python '${{ steps.cp310.outputs.python-path }}' nox --version
```

>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.
# Getting started with Python + Actions

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).
Expand Down
2 changes: 1 addition & 1 deletion dist/setup/index.js
Expand Up @@ -63993,7 +63993,7 @@ function findPyPyVersion(versionSpec, architecture) {
const binaryExtension = utils_1.IS_WINDOWS ? '.exe' : '';
const pythonPath = path.join(utils_1.IS_WINDOWS ? installDir : _binDir, `python${binaryExtension}`);
const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
core.exportVariable('pythonLocation', pythonLocation);
core.exportVariable('pythonLocation', installDir);
core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
core.addPath(pythonLocation);
core.addPath(_binDir);
Expand Down
2 changes: 1 addition & 1 deletion src/find-pypy.ts
Expand Up @@ -54,7 +54,7 @@ export async function findPyPyVersion(
`python${binaryExtension}`
);
const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
core.exportVariable('pythonLocation', pythonLocation);
core.exportVariable('pythonLocation', installDir);
core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
core.addPath(pythonLocation);
core.addPath(_binDir);
Expand Down

0 comments on commit f72db17

Please sign in to comment.