Skip to content

Commit e629242

Browse files
committed
Fix failed check
1 parent 63086c6 commit e629242

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

dist/setup/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64048,14 +64048,6 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
6404864048
`The list of all available versions can be found here: ${installer.MANIFEST_URL}`
6404964049
].join(os.EOL));
6405064050
}
64051-
core.exportVariable('pythonLocation', installDir);
64052-
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
64053-
core.exportVariable('Python_ROOT_DIR', installDir);
64054-
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
64055-
core.exportVariable('Python2_ROOT_DIR', installDir);
64056-
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
64057-
core.exportVariable('Python3_ROOT_DIR', installDir);
64058-
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
6405964051
if (utils_1.IS_LINUX) {
6406064052
const libPath = process.env.LD_LIBRARY_PATH
6406164053
? `:${process.env.LD_LIBRARY_PATH}`
@@ -64071,6 +64063,14 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
6407164063
if (updateEnvironment) {
6407264064
core.exportVariable('pythonLocation', installDir);
6407364065
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
64066+
core.exportVariable('pythonLocation', installDir);
64067+
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
64068+
core.exportVariable('Python_ROOT_DIR', installDir);
64069+
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
64070+
core.exportVariable('Python2_ROOT_DIR', installDir);
64071+
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
64072+
core.exportVariable('Python3_ROOT_DIR', installDir);
64073+
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
6407464074
if (utils_1.IS_LINUX) {
6407564075
const libPath = process.env.LD_LIBRARY_PATH
6407664076
? `:${process.env.LD_LIBRARY_PATH}`

src/find-python.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@ export async function useCpythonVersion(
7070
);
7171
}
7272

73-
core.exportVariable('pythonLocation', installDir);
74-
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
75-
core.exportVariable('Python_ROOT_DIR', installDir);
76-
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
77-
core.exportVariable('Python2_ROOT_DIR', installDir);
78-
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
79-
core.exportVariable('Python3_ROOT_DIR', installDir);
80-
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
81-
8273
if (IS_LINUX) {
8374
const libPath = process.env.LD_LIBRARY_PATH
8475
? `:${process.env.LD_LIBRARY_PATH}`
@@ -99,6 +90,14 @@ export async function useCpythonVersion(
9990
if (updateEnvironment) {
10091
core.exportVariable('pythonLocation', installDir);
10192
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
93+
core.exportVariable('pythonLocation', installDir);
94+
// https://cmake.org/cmake/help/latest/module/FindPython.html#module:FindPython
95+
core.exportVariable('Python_ROOT_DIR', installDir);
96+
// https://cmake.org/cmake/help/latest/module/FindPython2.html#module:FindPython2
97+
core.exportVariable('Python2_ROOT_DIR', installDir);
98+
// https://cmake.org/cmake/help/latest/module/FindPython3.html#module:FindPython3
99+
core.exportVariable('Python3_ROOT_DIR', installDir);
100+
core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
102101

103102
if (IS_LINUX) {
104103
const libPath = process.env.LD_LIBRARY_PATH

0 commit comments

Comments
 (0)