actions/setup-python
1
0
Fork 0
mirror of https://github.com/actions/setup-python.git synced 2024-11-25 10:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug in resolveVersionInput()

Browse source
This commit is contained in:
IvanZosimov 2022-06-30 13:38:43 +02:00
parent ab6deb310f
commit afd3e72a25
2 changed files with 41 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dist/setup/index.js vendored
View file

@ -64471,12 +64471,24 @@ function resolveVersionInput() {
if (version) { if (version) {
return version; return version;
} }
versionFile = versionFile || '.python-version'; if (versionFile) {
if (!fs_1.default.existsSync(versionFile)) { const defaultVersionFile = '.python-version';
throw new Error(`The specified python version file at: ${versionFile} does not exist`); const VersionFileExists = fs_1.default.existsSync(versionFile);
const defaultVersionFileExists = fs_1.default.existsSync(defaultVersionFile);
if (!VersionFileExists && !defaultVersionFileExists) {
throw new Error(`The specified python version file at: ${versionFile} does not exist and default ${defaultVersionFile} file isn't found`);
} }
if (VersionFileExists) {
version = fs_1.default.readFileSync(versionFile, 'utf8'); version = fs_1.default.readFileSync(versionFile, 'utf8');
core.info(`Resolved ${versionFile} as ${version}`); core.info(`Resolved ${versionFile} as ${version}`);
}
else {
version = fs_1.default.readFileSync('.python-version', 'utf8');
core.info(`Resolved ${'.python-version'} as ${version}`);
}
return version;
}
core.warning("Neither 'python-version' nor 'python-version-file' inputs were supplied. ");
return version; return version;
} }
function run() { function run() {

22
src/setup-python.ts
View file

@ -36,18 +36,34 @@ function resolveVersionInput(): string {
return version; return version;
} }
versionFile = versionFile || '.python-version'; if (versionFile) {
if (!fs.existsSync(versionFile)) { const defaultVersionFile = '.python-version';
const VersionFileExists = fs.existsSync(versionFile);
const defaultVersionFileExists = fs.existsSync(defaultVersionFile);
if (!VersionFileExists && !defaultVersionFileExists) {
throw new Error( throw new Error(
`The specified python version file at: ${versionFile} does not exist` `The specified python version file at: ${versionFile} does not exist and default ${defaultVersionFile} file isn't found`
); );
} }
if (VersionFileExists) {
version = fs.readFileSync(versionFile, 'utf8'); version = fs.readFileSync(versionFile, 'utf8');
core.info(`Resolved ${versionFile} as ${version}`); core.info(`Resolved ${versionFile} as ${version}`);
} else {
version = fs.readFileSync('.python-version', 'utf8');
core.info(`Resolved ${'.python-version'} as ${version}`);
}
return version; return version;
} }
core.warning(
"Neither 'python-version' nor 'python-version-file' inputs were supplied. "
);
return version;
}
async function run() { async function run() {
if (process.env.AGENT_TOOLSDIRECTORY?.trim()) { if (process.env.AGENT_TOOLSDIRECTORY?.trim()) {
core.debug( core.debug(