Fix failed check

actions · Jun 30, 2022 · e629242 · e629242
1 parent 63086c6
commit e629242
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -64048,14 +64048,6 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
                 `The list of all available versions can be found here: ${installer.MANIFEST_URL}`
             ].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) {
             const libPath = process.env.LD_LIBRARY_PATH
                 ? `:${process.env.LD_LIBRARY_PATH}`
@@ -64071,6 +64063,14 @@ function useCpythonVersion(version, architecture, updateEnvironment) {
         if (updateEnvironment) {
             core.exportVariable('pythonLocation', installDir);
             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) {
                 const libPath = process.env.LD_LIBRARY_PATH
                     ? `:${process.env.LD_LIBRARY_PATH}`

diff --git a/src/find-python.ts b/src/find-python.ts
@@ -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) {
     const libPath = process.env.LD_LIBRARY_PATH
       ? `:${process.env.LD_LIBRARY_PATH}`
@@ -99,6 +90,14 @@ export async function useCpythonVersion(
   if (updateEnvironment) {
     core.exportVariable('pythonLocation', installDir);
     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) {
       const libPath = process.env.LD_LIBRARY_PATH