mirror of
				https://gitea.com/actions/setup-python.git
				synced 2025-10-31 07:47:08 +00:00 
			
		
		
		
	Include python version in PyPy python-version output (#1110)
This commit is contained in:
		
							
								
								
									
										2
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -95875,7 +95875,7 @@ function findPyPyVersion(versionSpec, architecture, updateEnvironment, checkLate | |||||||
|             core.addPath(pythonLocation); |             core.addPath(pythonLocation); | ||||||
|             core.addPath(_binDir); |             core.addPath(_binDir); | ||||||
|         } |         } | ||||||
|         core.setOutput('python-version', 'pypy' + resolvedPyPyVersion); |         core.setOutput('python-version', `pypy${resolvedPythonVersion}-${resolvedPyPyVersion}`); | ||||||
|         core.setOutput('python-path', pythonPath); |         core.setOutput('python-path', pythonPath); | ||||||
|         return { resolvedPyPyVersion, resolvedPythonVersion }; |         return { resolvedPyPyVersion, resolvedPythonVersion }; | ||||||
|     }); |     }); | ||||||
|   | |||||||
| @@ -96,7 +96,10 @@ export async function findPyPyVersion( | |||||||
|     core.addPath(pythonLocation); |     core.addPath(pythonLocation); | ||||||
|     core.addPath(_binDir); |     core.addPath(_binDir); | ||||||
|   } |   } | ||||||
|   core.setOutput('python-version', 'pypy' + resolvedPyPyVersion); |   core.setOutput( | ||||||
|  |     'python-version', | ||||||
|  |     `pypy${resolvedPythonVersion}-${resolvedPyPyVersion}` | ||||||
|  |   ); | ||||||
|   core.setOutput('python-path', pythonPath); |   core.setOutput('python-path', pythonPath); | ||||||
|  |  | ||||||
|   return {resolvedPyPyVersion, resolvedPythonVersion}; |   return {resolvedPyPyVersion, resolvedPythonVersion}; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Marc Mueller
					Marc Mueller