Extend PKG_CONFIG path rather than setting it

Author: chrhansk

src/find-graalpy.ts

@@ -6,6 +6,10 @@ import * as semver from 'semver';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 
+import {
+  addPkgConfigPathToEnv
+} from './utils';
+
 export async function findGraalPyVersion(
   versionSpec: string,
   architecture: string,
@@ -67,7 +71,7 @@ export async function findGraalPyVersion(
     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', pythonLocation + '/lib/pkgconfig');
+    addPkgConfigPathToEnv(pythonLocation + '/lib/pkgconfig');
     core.addPath(pythonLocation);
     core.addPath(_binDir);
   }

src/find-pypy.ts

@@ -8,7 +8,8 @@ import {
   readExactPyPyVersionFile,
   validatePythonVersionFormatForPyPy,
   IPyPyManifestRelease,
-  getBinaryDirectory
+  getBinaryDirectory,
+  addPkgConfigPathToEnv
 } from './utils';
 
 import * as semver from 'semver';
@@ -92,7 +93,8 @@ export async function findPyPyVersion(
     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', pythonLocation + '/lib/pkgconfig');
+    addPkgConfigPathToEnv(pythonLocation + '/lib/pkgconfig');
+
     core.addPath(pythonLocation);
     core.addPath(_binDir);
   }

src/find-python.ts

@@ -10,6 +10,10 @@ import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import * as exec from '@actions/exec';
 
+import {
+  addPkgConfigPathToEnv
+} from './utils';
+
 // Python has "scripts" or "bin" directories where command-line tools that come with packages are installed.
 // This is where pip is, along with anything that pip installs.
 // There is a separate directory for `pip install --user`.
@@ -150,15 +154,15 @@ 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');
+
+    addPkgConfigPathToEnv(installDir + '/lib/pkgconfig');
 
     if (IS_LINUX) {
       const libPath = process.env.LD_LIBRARY_PATH

src/utils.ts

@@ -422,3 +422,18 @@ export function getDownloadFileName(downloadUrl: string): string | undefined {
     ? path.join(tempDir, path.basename(downloadUrl))
     : undefined;
 }
+
+
+export function addPkgConfigPathToEnv(path: string): undefined {
+  const pkg_config_path = process.env["PKG_CONFIG_PATH"];
+
+  if (pkg_config_path === undefined) {
+    core.exportVariable('PKG_CONFIG_PATH', path);
+  } else {
+    if(IS_WINDOWS) {
+      core.exportVariable('PKG_CONFIG_PATH', `${path};${pkg_config_path}`);
+    } else {
+      core.exportVariable('PKG_CONFIG_PATH', `${path}:${pkg_config_path}`);
+    }
+  }
+}