actions
/
setup-python
Template
mirror of https://github.com/actions/setup-python
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trim trailing newlines from `resolvedPyPyVersion` (#610) 

Fixes #609
This commit is contained in:
Kurt McKee 2023-02-20 04:28:16 -06:00 committed by GitHub
parent 3faddefb4c
commit 869e769ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/setup/index.js vendored
View File

@ -66283,7 +66283,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.trim()); core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
core.setOutput('python-path', pythonPath); core.setOutput('python-path', pythonPath);
return { resolvedPyPyVersion, resolvedPythonVersion }; return { resolvedPyPyVersion, resolvedPythonVersion };
}); });
@ -66699,7 +66699,7 @@ function findRelease(releases, pythonVersion, pypyVersion, architecture, include
return { return {
foundAsset, foundAsset,
resolvedPythonVersion: foundRelease.python_version, resolvedPythonVersion: foundRelease.python_version,
resolvedPyPyVersion: foundRelease.pypy_version resolvedPyPyVersion: foundRelease.pypy_version.trim()
}; };
} }
exports.findRelease = findRelease; exports.findRelease = findRelease;
@ -67095,7 +67095,7 @@ function readExactPyPyVersionFile(installDir) {
let pypyVersion = ''; let pypyVersion = '';
let fileVersion = path.join(installDir, PYPY_VERSION_FILE); let fileVersion = path.join(installDir, PYPY_VERSION_FILE);
if (fs_1.default.existsSync(fileVersion)) { if (fs_1.default.existsSync(fileVersion)) {
pypyVersion = fs_1.default.readFileSync(fileVersion).toString(); pypyVersion = fs_1.default.readFileSync(fileVersion).toString().trim();
} }
return pypyVersion; return pypyVersion;
} }

2
src/find-pypy.ts
View File

@ -98,7 +98,7 @@ export async function findPyPyVersion(
core.addPath(pythonLocation); core.addPath(pythonLocation);
core.addPath(_binDir); core.addPath(_binDir);
} }
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim()); core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
core.setOutput('python-path', pythonPath); core.setOutput('python-path', pythonPath);
return {resolvedPyPyVersion, resolvedPythonVersion}; return {resolvedPyPyVersion, resolvedPythonVersion};

2
src/install-pypy.ts
View File

@ -233,7 +233,7 @@ export function findRelease(
return { return {
foundAsset, foundAsset,
resolvedPythonVersion: foundRelease.python_version, resolvedPythonVersion: foundRelease.python_version,
resolvedPyPyVersion: foundRelease.pypy_version resolvedPyPyVersion: foundRelease.pypy_version.trim()
}; };
} }

2
src/utils.ts
View File

@ -73,7 +73,7 @@ export function readExactPyPyVersionFile(installDir: string) {
let pypyVersion = ''; let pypyVersion = '';
let fileVersion = path.join(installDir, PYPY_VERSION_FILE); let fileVersion = path.join(installDir, PYPY_VERSION_FILE);
if (fs.existsSync(fileVersion)) { if (fs.existsSync(fileVersion)) {
pypyVersion = fs.readFileSync(fileVersion).toString(); pypyVersion = fs.readFileSync(fileVersion).toString().trim();
} }
return pypyVersion; return pypyVersion;