Trim trailing newlines from resolvedPyPyVersion (actions#610)

kurtmckee · web-flow · commit 869e769ec839 · 2023-02-20T11:28:16.000+01:00
Fixes actions#609
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -66283,7 +66283,7 @@ function findPyPyVersion(versionSpec, architecture, updateEnvironment, checkLate
             core.addPath(pythonLocation);
             core.addPath(_binDir);
         }
-        core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
+        core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
         core.setOutput('python-path', pythonPath);
         return { resolvedPyPyVersion, resolvedPythonVersion };
     });
@@ -66699,7 +66699,7 @@ function findRelease(releases, pythonVersion, pypyVersion, architecture, include
     return {
         foundAsset,
         resolvedPythonVersion: foundRelease.python_version,
-        resolvedPyPyVersion: foundRelease.pypy_version
+        resolvedPyPyVersion: foundRelease.pypy_version.trim()
     };
 }
 exports.findRelease = findRelease;
@@ -67095,7 +67095,7 @@ function readExactPyPyVersionFile(installDir) {
     let pypyVersion = '';
     let fileVersion = path.join(installDir, PYPY_VERSION_FILE);
     if (fs_1.default.existsSync(fileVersion)) {
-        pypyVersion = fs_1.default.readFileSync(fileVersion).toString();
+        pypyVersion = fs_1.default.readFileSync(fileVersion).toString().trim();
     }
     return pypyVersion;
 }
diff --git a/src/find-pypy.ts b/src/find-pypy.ts
@@ -98,7 +98,7 @@ export async function findPyPyVersion(
     core.addPath(pythonLocation);
     core.addPath(_binDir);
   }
-  core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
+  core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);
   core.setOutput('python-path', pythonPath);
 
   return {resolvedPyPyVersion, resolvedPythonVersion};
diff --git a/src/install-pypy.ts b/src/install-pypy.ts
@@ -233,7 +233,7 @@ export function findRelease(
   return {
     foundAsset,
     resolvedPythonVersion: foundRelease.python_version,
-    resolvedPyPyVersion: foundRelease.pypy_version
+    resolvedPyPyVersion: foundRelease.pypy_version.trim()
   };
 }
 
diff --git a/src/utils.ts b/src/utils.ts
@@ -73,7 +73,7 @@ export function readExactPyPyVersionFile(installDir: string) {
   let pypyVersion = '';
   let fileVersion = path.join(installDir, PYPY_VERSION_FILE);
   if (fs.existsSync(fileVersion)) {
-    pypyVersion = fs.readFileSync(fileVersion).toString();
+    pypyVersion = fs.readFileSync(fileVersion).toString().trim();
   }
 
   return pypyVersion;

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export async function findPyPyVersion(`
`98`	`98`	`core.addPath(pythonLocation);`
`99`	`99`	`core.addPath(_binDir);`
`100`	`100`	`}`
`101`		`- core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());`
	`101`	`+ core.setOutput('python-version', 'pypy' + resolvedPyPyVersion);`
`102`	`102`	`core.setOutput('python-path', pythonPath);`
`103`	`103`
`104`	`104`	`return {resolvedPyPyVersion, resolvedPythonVersion};`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ export function findRelease(`
`233`	`233`	`return {`
`234`	`234`	`foundAsset,`
`235`	`235`	`resolvedPythonVersion: foundRelease.python_version,`
`236`		`- resolvedPyPyVersion: foundRelease.pypy_version`
	`236`	`+ resolvedPyPyVersion: foundRelease.pypy_version.trim()`
`237`	`237`	`};`
`238`	`238`	`}`
`239`	`239`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export function readExactPyPyVersionFile(installDir: string) {`
`73`	`73`	`let pypyVersion = '';`
`74`	`74`	`let fileVersion = path.join(installDir, PYPY_VERSION_FILE);`
`75`	`75`	`if (fs.existsSync(fileVersion)) {`
`76`		`- pypyVersion = fs.readFileSync(fileVersion).toString();`
	`76`	`+ pypyVersion = fs.readFileSync(fileVersion).toString().trim();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`return pypyVersion;`