actions/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2024-11-24 17:38:52 +00:00
Code Issues Releases Wiki Activity

Extend LIBRARY_PATH as well as LD_LIBRARY_PATH on Linux

Browse source
This commit is contained in:
Tristan Keen 2024-07-12 20:38:59 +01:00
parent 39cd14951b
commit 42afbeef7f
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dist/setup/index.js vendored
View file

@ -91070,13 +91070,9 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
core.exportVariable('Python3_ROOT_DIR', installDir); core.exportVariable('Python3_ROOT_DIR', installDir);
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig'); core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
if (utils_1.IS_LINUX) { if (utils_1.IS_LINUX) {
const libPath = process.env.LD_LIBRARY_PATH
? `:${process.env.LD_LIBRARY_PATH}`
: '';
const pyLibPath = path.join(installDir, 'lib'); const pyLibPath = path.join(installDir, 'lib');
if (!libPath.split(':').includes(pyLibPath)) { ensurePathInEnvVar('LIBRARY_PATH', pyLibPath);
core.exportVariable('LD_LIBRARY_PATH', pyLibPath + libPath); ensurePathInEnvVar('LD_LIBRARY_PATH', pyLibPath);
}
} }
core.addPath(installDir); core.addPath(installDir);
core.addPath(_binDir); core.addPath(_binDir);
@ -91099,6 +91095,15 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
}); });
} }
exports.useCpythonVersion = useCpythonVersion; exports.useCpythonVersion = useCpythonVersion;
/** Ensure a folder is present in a colon-separated env-var */
function ensurePathInEnvVar(envVarName, extraPath) {
const currentPath = process.env[envVarName]
? `:${process.env[envVarName]}`
: '';
if (!currentPath.split(':').includes(extraPath)) {
core.exportVariable(envVarName, extraPath + currentPath);
}
}
/** Convert versions like `3.8-dev` to a version like `~3.8.0-0`. */ /** Convert versions like `3.8-dev` to a version like `~3.8.0-0`. */
function desugarDevVersion(versionSpec) { function desugarDevVersion(versionSpec) {
const devVersion = /^(\d+)\.(\d+)-dev$/; const devVersion = /^(\d+)\.(\d+)-dev$/;

21
src/find-python.ts
View file

@ -121,15 +121,11 @@ export async function useCpythonVersion(
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig'); core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
if (IS_LINUX) { if (IS_LINUX) {
const libPath = process.env.LD_LIBRARY_PATH
? `:${process.env.LD_LIBRARY_PATH}`
: '';
const pyLibPath = path.join(installDir, 'lib'); const pyLibPath = path.join(installDir, 'lib');
ensurePathInEnvVar('LIBRARY_PATH', pyLibPath);
if (!libPath.split(':').includes(pyLibPath)) { ensurePathInEnvVar('LD_LIBRARY_PATH', pyLibPath);
core.exportVariable('LD_LIBRARY_PATH', pyLibPath + libPath);
}
} }
core.addPath(installDir); core.addPath(installDir);
core.addPath(_binDir); core.addPath(_binDir);
@ -159,6 +155,17 @@ export async function useCpythonVersion(
return {impl: 'CPython', version: installed}; return {impl: 'CPython', version: installed};
} }
/** Ensure a folder is present in a colon-separated env-var */
function ensurePathInEnvVar(envVarName: string, extraPath: string) {
const currentPath = process.env[envVarName]
? `:${process.env[envVarName]}`
: '';
if (!currentPath.split(':').includes(extraPath)) {
core.exportVariable(envVarName, extraPath + currentPath);
}
}
/** Convert versions like `3.8-dev` to a version like `~3.8.0-0`. */ /** Convert versions like `3.8-dev` to a version like `~3.8.0-0`. */
function desugarDevVersion(versionSpec: string) { function desugarDevVersion(versionSpec: string) {
const devVersion = /^(\d+)\.(\d+)-dev$/; const devVersion = /^(\d+)\.(\d+)-dev$/;