Skip to content

Commit afd3e72

Browse files
author
IvanZosimov
committed
Fix bug in resolveVersionInput()
1 parent ab6deb3 commit afd3e72

File tree

2 files changed

+40
-12
lines changed

2 files changed

+40
-12
lines changed

dist/setup/index.js

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64471,12 +64471,24 @@ function resolveVersionInput() {
6447164471
if (version) {
6447264472
return version;
6447364473
}
64474-
versionFile = versionFile || '.python-version';
64475-
if (!fs_1.default.existsSync(versionFile)) {
64476-
throw new Error(`The specified python version file at: ${versionFile} does not exist`);
64474+
if (versionFile) {
64475+
const defaultVersionFile = '.python-version';
64476+
const VersionFileExists = fs_1.default.existsSync(versionFile);
64477+
const defaultVersionFileExists = fs_1.default.existsSync(defaultVersionFile);
64478+
if (!VersionFileExists && !defaultVersionFileExists) {
64479+
throw new Error(`The specified python version file at: ${versionFile} does not exist and default ${defaultVersionFile} file isn't found`);
64480+
}
64481+
if (VersionFileExists) {
64482+
version = fs_1.default.readFileSync(versionFile, 'utf8');
64483+
core.info(`Resolved ${versionFile} as ${version}`);
64484+
}
64485+
else {
64486+
version = fs_1.default.readFileSync('.python-version', 'utf8');
64487+
core.info(`Resolved ${'.python-version'} as ${version}`);
64488+
}
64489+
return version;
6447764490
}
64478-
version = fs_1.default.readFileSync(versionFile, 'utf8');
64479-
core.info(`Resolved ${versionFile} as ${version}`);
64491+
core.warning("Neither 'python-version' nor 'python-version-file' inputs were supplied. ");
6448064492
return version;
6448164493
}
6448264494
function run() {

src/setup-python.ts

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,31 @@ function resolveVersionInput(): string {
3636
return version;
3737
}
3838

39-
versionFile = versionFile || '.python-version';
40-
if (!fs.existsSync(versionFile)) {
41-
throw new Error(
42-
`The specified python version file at: ${versionFile} does not exist`
43-
);
39+
if (versionFile) {
40+
const defaultVersionFile = '.python-version';
41+
42+
const VersionFileExists = fs.existsSync(versionFile);
43+
const defaultVersionFileExists = fs.existsSync(defaultVersionFile);
44+
45+
if (!VersionFileExists && !defaultVersionFileExists) {
46+
throw new Error(
47+
`The specified python version file at: ${versionFile} does not exist and default ${defaultVersionFile} file isn't found`
48+
);
49+
}
50+
if (VersionFileExists) {
51+
version = fs.readFileSync(versionFile, 'utf8');
52+
core.info(`Resolved ${versionFile} as ${version}`);
53+
} else {
54+
version = fs.readFileSync('.python-version', 'utf8');
55+
core.info(`Resolved ${'.python-version'} as ${version}`);
56+
}
57+
58+
return version;
4459
}
45-
version = fs.readFileSync(versionFile, 'utf8');
46-
core.info(`Resolved ${versionFile} as ${version}`);
4760

61+
core.warning(
62+
"Neither 'python-version' nor 'python-version-file' inputs were supplied. "
63+
);
4864
return version;
4965
}
5066

0 commit comments

Comments
 (0)