From 6bf279d08adfb386637ebb79f7370d89036cc15e Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sun, 2 Apr 2023 20:25:49 +0530 Subject: [PATCH] Fix reading php version from file --- dist/index.js | 2 +- src/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index cbe34622..cbabb0c0 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1289,7 +1289,7 @@ async function resolveVersion() { } const versionFile = (await getInput('php-version-file', false)) || '.php-version'; if (fs_1.default.existsSync(versionFile)) { - return fs_1.default.readFileSync(versionFile, 'utf8'); + return fs_1.default.readFileSync(versionFile, 'utf8').replace(/[\r\n]/g, ''); } else if (versionFile !== '.php-version') { throw new Error(`Could not find '${versionFile}' file.`); diff --git a/src/utils.ts b/src/utils.ts index 0bcaf447..ef5d4cf3 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -435,7 +435,7 @@ export async function resolveVersion(): Promise { const versionFile = (await getInput('php-version-file', false)) || '.php-version'; if (fs.existsSync(versionFile)) { - return fs.readFileSync(versionFile, 'utf8'); + return fs.readFileSync(versionFile, 'utf8').replace(/[\r\n]/g, ''); } else if (versionFile !== '.php-version') { throw new Error(`Could not find '${versionFile}' file.`); }