added action output python-install-dir

arBmind · arBmind · commit 7a537682efba · 2021-12-05T16:32:42.000+01:00
* also fixed export of python-version for pypy installs
diff --git a/action.yml b/action.yml
@@ -19,6 +19,8 @@ inputs:
 outputs:
   python-version:
     description: "The installed python version. Useful when given a version range as input."
+  python-install-dir:
+    description: "The path where python was installed. (PYTHON_INSTALL_DIR)"
 runs:
   using: 'node12'
   main: 'dist/setup/index.js'
diff --git a/src/find-pypy.ts b/src/find-pypy.ts
@@ -53,6 +53,9 @@ export async function findPyPyVersion(
   core.addPath(pythonLocation);
   core.addPath(_binDir);
 
+  core.setOutput('python-version', resolvedPythonVersion);
+  core.setOutput('python-install-dir', installDir);
+
   return {resolvedPyPyVersion, resolvedPythonVersion};
 }
 
diff --git a/src/find-python.ts b/src/find-python.ts
@@ -71,6 +71,7 @@ function usePyPy(
 
   const impl = 'pypy' + majorVersion.toString();
   core.setOutput('python-version', impl);
+  core.setOutput('python-install-dir', installDir);
 
   return {impl: impl, version: versionFromPath(installDir)};
 }
@@ -150,6 +151,7 @@ async function useCpythonVersion(
 
   const installed = versionFromPath(installDir);
   core.setOutput('python-version', installed);
+  core.setOutput('python-install-dir', installDir);
 
   return {impl: 'CPython', version: installed};
 }

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ export async function findPyPyVersion(`
`53`	`53`	`core.addPath(pythonLocation);`
`54`	`54`	`core.addPath(_binDir);`
`55`	`55`
	`56`	`+ core.setOutput('python-version', resolvedPythonVersion);`
	`57`	`+ core.setOutput('python-install-dir', installDir);`
	`58`	`+`
`56`	`59`	`return {resolvedPyPyVersion, resolvedPythonVersion};`
`57`	`60`	`}`
`58`	`61`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ function usePyPy(`
`71`	`71`
`72`	`72`	`const impl = 'pypy' + majorVersion.toString();`
`73`	`73`	`core.setOutput('python-version', impl);`
	`74`	`+ core.setOutput('python-install-dir', installDir);`
`74`	`75`
`75`	`76`	`return {impl: impl, version: versionFromPath(installDir)};`
`76`	`77`	`}`
`@@ -150,6 +151,7 @@ async function useCpythonVersion(`
`150`	`151`
`151`	`152`	`const installed = versionFromPath(installDir);`
`152`	`153`	`core.setOutput('python-version', installed);`
	`154`	`+ core.setOutput('python-install-dir', installDir);`
`153`	`155`
`154`	`156`	`return {impl: 'CPython', version: installed};`
`155`	`157`	`}`