8000 Include python version in PyPy python-version output · cdce8p/setup-python@777921e · GitHub
[go: up one dir, main page]

Skip to content

Commit 777921e

Browse files
committed
Include python version in PyPy python-version output
1 parent a26af69 commit 777921e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

dist/setup/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95953,7 +95953,7 @@ function findPyPyVersion(versionSpec, architecture, updateEnvironment, checkLate
9595395953
core.addPath(pythonLocation);
9595495954
core.addPath(_binDir);
9595595955
}
95956-
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
95956+
core.setOutput('python-version', `pypy${resolvedPythonVersion}-${resolvedPyPyVersion}`);
9595795957
core.setOutput('python-path', pythonPath);
9595895958
return { resolvedPyPyVersion, resolvedPythonVersion };
9595995959
});

src/find-pypy.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,10 @@ export async function findPyPyVersion(
9696
core.addPath(pythonLocation);
9797
core.addPath(_binDir);
9898
}
99-
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
99+
core.setOutput(
100+
'python-version',
101+
`pypy${resolvedPythonVersion}-${resolvedPyPyVersion}`
102+
);
100103
core.setOutput('python-path', pythonPath);
101104

102105
return {resolvedPyPyVersion, resolvedPythonVersion};

0 commit comments

Comments
 (0)
0