mirror of
https://github.com/actions/setup-python.git
synced 2024-11-05 23:45:49 -05:00
Fix failed check
This commit is contained in:
parent
63086c6ded
commit
e629242ad4
2 changed files with 16 additions and 17 deletions
16
dist/setup/index.js
vendored
16
dist/setup/index.js
vendored
|
@ -64048,14 +64048,6 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
|
||||||
`The list of all available versions can be found here: ${installer.MANIFEST_URL}`
|
`The list of all available versions can be found here: ${installer.MANIFEST_URL}`
|
||||||
].join(os.EOL));
|
].join(os.EOL));
|
||||||
}
|
}
|
||||||
core.exportVariable('pythonLocation', installDir);
|
|
||||||
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
|
|
||||||
core.exportVariable('Python_ROOT_DIR', installDir);
|
|
||||||
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
|
|
||||||
core.exportVariable('Python2_ROOT_DIR', installDir);
|
|
||||||
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
|
|
||||||
core.exportVariable('Python3_ROOT_DIR', installDir);
|
|
||||||
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
|
const libPath = process.env.LD_LIBRARY_PATH
|
||||||
? `:${process.env.LD_LIBRARY_PATH}`
|
? `:${process.env.LD_LIBRARY_PATH}`
|
||||||
|
@ -64071,6 +64063,14 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
|
||||||
if (updateEnvironment) {
|
if (updateEnvironment) {
|
||||||
core.exportVariable('pythonLocation', installDir);
|
core.exportVariable('pythonLocation', installDir);
|
||||||
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
|
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
|
||||||
|
core.exportVariable('pythonLocation', installDir);
|
||||||
|
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
|
||||||
|
core.exportVariable('Python_ROOT_DIR', installDir);
|
||||||
|
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
|
||||||
|
core.exportVariable('Python2_ROOT_DIR', installDir);
|
||||||
|
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
|
||||||
|
core.exportVariable('Python3_ROOT_DIR', installDir);
|
||||||
|
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
|
const libPath = process.env.LD_LIBRARY_PATH
|
||||||
? `:${process.env.LD_LIBRARY_PATH}`
|
? `:${process.env.LD_LIBRARY_PATH}`
|
||||||
|
|
|
@ -70,15 +70,6 @@ export async function useCpythonVersion(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
core.exportVariable('pythonLocation', installDir);
|
|
||||||
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
|
|
||||||
core.exportVariable('Python_ROOT_DIR', installDir);
|
|
||||||
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
|
|
||||||
core.exportVariable('Python2_ROOT_DIR', installDir);
|
|
||||||
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
|
|
||||||
core.exportVariable('Python3_ROOT_DIR', installDir);
|
|
||||||
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
|
|
||||||
|
|
||||||
if (IS_LINUX) {
|
if (IS_LINUX) {
|
||||||
const libPath = process.env.LD_LIBRARY_PATH
|
const libPath = process.env.LD_LIBRARY_PATH
|
||||||
? `:${process.env.LD_LIBRARY_PATH}`
|
? `:${process.env.LD_LIBRARY_PATH}`
|
||||||
|
@ -99,6 +90,14 @@ export async function useCpythonVersion(
|
||||||
if (updateEnvironment) {
|
if (updateEnvironment) {
|
||||||
core.exportVariable('pythonLocation', installDir);
|
core.exportVariable('pythonLocation', installDir);
|
||||||
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
|
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
|
||||||
|
core.exportVariable('pythonLocation', installDir);
|
||||||
|
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
|
||||||
|
core.exportVariable('Python_ROOT_DIR', installDir);
|
||||||
|
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
|
||||||
|
core.exportVariable('Python2_ROOT_DIR', installDir);
|
||||||
|
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
|
||||||
|
core.exportVariable('Python3_ROOT_DIR', installDir);
|
||||||
|
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
|
||||||
|
|
||||||
if (IS_LINUX) {
|
if (IS_LINUX) {
|
||||||
const libPath = process.env.LD_LIBRARY_PATH
|
const libPath = process.env.LD_LIBRARY_PATH
|
||||||
|
|
Loading…
Reference in a new issue