mirror of
https://github.com/actions/setup-python.git
synced 2024-12-27 01:50:35 +01:00
Allow python-version-file
to be a relative path (#431)
This commit is contained in:
parent
cf86e08a31
commit
ffcd00020c
3 changed files with 12 additions and 15 deletions
10
dist/setup/index.js
vendored
10
dist/setup/index.js
vendored
|
@ -64546,18 +64546,18 @@ function cacheDependencies(cache, pythonVersion) {
|
||||||
}
|
}
|
||||||
function resolveVersionInput() {
|
function resolveVersionInput() {
|
||||||
let version = core.getInput('python-version');
|
let version = core.getInput('python-version');
|
||||||
const versionFile = core.getInput('python-version-file');
|
let versionFile = core.getInput('python-version-file');
|
||||||
if (version && versionFile) {
|
if (version && versionFile) {
|
||||||
core.warning('Both python-version and python-version-file inputs are specified, only python-version will be used');
|
core.warning('Both python-version and python-version-file inputs are specified, only python-version will be used');
|
||||||
}
|
}
|
||||||
if (version) {
|
if (version) {
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
const versionFilePath = path.join(process.env.GITHUB_WORKSPACE, versionFile || '.python-version');
|
versionFile = versionFile || '.python-version';
|
||||||
if (!fs_1.default.existsSync(versionFilePath)) {
|
if (!fs_1.default.existsSync(versionFile)) {
|
||||||
throw new Error(`The specified python version file at: ${versionFilePath} does not exist`);
|
throw new Error(`The specified python version file at: ${versionFile} does not exist`);
|
||||||
}
|
}
|
||||||
version = fs_1.default.readFileSync(versionFilePath, 'utf8');
|
version = fs_1.default.readFileSync(versionFile, 'utf8');
|
||||||
core.info(`Resolved ${versionFile} as ${version}`);
|
core.info(`Resolved ${versionFile} as ${version}`);
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
4
package-lock.json
generated
4
package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "setup-python",
|
"name": "setup-python",
|
||||||
"version": "3.1.1",
|
"version": "4.0.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "setup-python",
|
"name": "setup-python",
|
||||||
"version": "3.1.1",
|
"version": "4.0.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/cache": "^2.0.2",
|
"@actions/cache": "^2.0.2",
|
||||||
|
|
|
@ -24,7 +24,7 @@ async function cacheDependencies(cache: string, pythonVersion: string) {
|
||||||
|
|
||||||
function resolveVersionInput(): string {
|
function resolveVersionInput(): string {
|
||||||
let version = core.getInput('python-version');
|
let version = core.getInput('python-version');
|
||||||
const versionFile = core.getInput('python-version-file');
|
let versionFile = core.getInput('python-version-file');
|
||||||
|
|
||||||
if (version && versionFile) {
|
if (version && versionFile) {
|
||||||
core.warning(
|
core.warning(
|
||||||
|
@ -36,16 +36,13 @@ function resolveVersionInput(): string {
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
const versionFilePath = path.join(
|
versionFile = versionFile || '.python-version';
|
||||||
process.env.GITHUB_WORKSPACE!,
|
if (!fs.existsSync(versionFile)) {
|
||||||
versionFile || '.python-version'
|
|
||||||
);
|
|
||||||
if (!fs.existsSync(versionFilePath)) {
|
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`The specified python version file at: ${versionFilePath} does not exist`
|
`The specified python version file at: ${versionFile} does not exist`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
version = fs.readFileSync(versionFilePath, 'utf8');
|
version = fs.readFileSync(versionFile, 'utf8');
|
||||||
core.info(`Resolved ${versionFile} as ${version}`);
|
core.info(`Resolved ${versionFile} as ${version}`);
|
||||||
|
|
||||||
return version;
|
return version;
|
||||||
|
|
Loading…
Reference in a new issue