mirror of
				https://kkgithub.com/actions/setup-python.git
				synced 2025-11-04 12:44:05 +08:00 
			
		
		
		
	Add pyton-version to setup PyPy output (#365)
* Add pyton-version to setup PyPy output * remove new line from pypy version * Move setOutput to findPyPyVersion * Resolve conflict: 2
This commit is contained in:
		
							
								
								
									
										1
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							@ -52347,6 +52347,7 @@ function findPyPyVersion(versionSpec, architecture) {
 | 
				
			|||||||
        core.exportVariable('pythonLocation', pythonLocation);
 | 
					        core.exportVariable('pythonLocation', pythonLocation);
 | 
				
			||||||
        core.addPath(pythonLocation);
 | 
					        core.addPath(pythonLocation);
 | 
				
			||||||
        core.addPath(_binDir);
 | 
					        core.addPath(_binDir);
 | 
				
			||||||
 | 
					        core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
 | 
				
			||||||
        return { resolvedPyPyVersion, resolvedPythonVersion };
 | 
					        return { resolvedPyPyVersion, resolvedPythonVersion };
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -52,6 +52,7 @@ export async function findPyPyVersion(
 | 
				
			|||||||
  core.exportVariable('pythonLocation', pythonLocation);
 | 
					  core.exportVariable('pythonLocation', pythonLocation);
 | 
				
			||||||
  core.addPath(pythonLocation);
 | 
					  core.addPath(pythonLocation);
 | 
				
			||||||
  core.addPath(_binDir);
 | 
					  core.addPath(_binDir);
 | 
				
			||||||
 | 
					  core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return {resolvedPyPyVersion, resolvedPythonVersion};
 | 
					  return {resolvedPyPyVersion, resolvedPythonVersion};
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user