ipacs/setup-php
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix reading php version from file

Browse source
This commit is contained in:
Shivam Mathur 2023-04-02 20:25:49 +05:30
parent bb16550379
commit 6bf279d08a
No known key found for this signature in database
GPG key ID: 3E13E4C8591ACC2A
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/index.js vendored
View file

@ -1289,7 +1289,7 @@ async function resolveVersion() {
} }
const versionFile = (await getInput('php-version-file', false)) || '.php-version'; const versionFile = (await getInput('php-version-file', false)) || '.php-version';
if (fs_1.default.existsSync(versionFile)) { 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') { else if (versionFile !== '.php-version') {
throw new Error(`Could not find '${versionFile}' file.`); throw new Error(`Could not find '${versionFile}' file.`);

2
src/utils.ts
View file

@ -435,7 +435,7 @@ export async function resolveVersion(): Promise<string> {
const versionFile = const versionFile =
(await getInput('php-version-file', false)) || '.php-version'; (await getInput('php-version-file', false)) || '.php-version';
if (fs.existsSync(versionFile)) { if (fs.existsSync(versionFile)) {
return fs.readFileSync(versionFile, 'utf8'); return fs.readFileSync(versionFile, 'utf8').replace(/[\r\n]/g, '');
} else if (versionFile !== '.php-version') { } else if (versionFile !== '.php-version') {
throw new Error(`Could not find '${versionFile}' file.`); throw new Error(`Could not find '${versionFile}' file.`);
} }