actions/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2025-07-05 00:53:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge branch 'main' into main

Browse source
This commit is contained in:
Andrew DiLosa 2022-05-26 15:53:02 -07:00 • committed by GitHub
commit 0669e36ab9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 83 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/find-pypy.ts
View file

@ -48,12 +48,18 @@ export async function findPyPyVersion(
const pipDir = IS_WINDOWS ? 'Scripts' : 'bin';
const _binDir = path.join(installDir, pipDir);
const binaryExtension = IS_WINDOWS ? '.exe' : '';
const pythonPath = path.join(
IS_WINDOWS ? installDir : _binDir,
`python${binaryExtension}`
);
const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
core.exportVariable('pythonLocation', pythonLocation);
core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
core.addPath(pythonLocation);
core.addPath(_binDir);
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
core.setOutput('python-path', pythonPath);
return {resolvedPyPyVersion, resolvedPythonVersion};
}

9
src/find-python.ts
View file

@ -83,8 +83,14 @@ export async function useCpythonVersion(
}
}
const _binDir = binDir(installDir);
const binaryExtension = IS_WINDOWS ? '.exe' : '';
const pythonPath = path.join(
IS_WINDOWS ? installDir : _binDir,
`python${binaryExtension}`
);
core.addPath(installDir);
core.addPath(binDir(installDir));
core.addPath(_binDir);
if (IS_WINDOWS) {
// Add --user directory
@ -106,6 +112,7 @@ export async function useCpythonVersion(
const installed = versionFromPath(installDir);
core.setOutput('python-version', installed);
core.setOutput('python-path', pythonPath);
return {impl: 'CPython', version: installed};
}