mirror of
https://github.com/actions-rs/toolchain.git
synced 2025-09-08 17:21:56 +03:00
Invert the priority order of the input and the rust-toolchain file
1. Not doing so would be a breaking change for users who have a rust-toolchain file with a different version from what they specify in the input. 2. Not doing so makes it overly complicated to install a specific version. Imagine you want to test your software against the version in the rust-toolchain file and nightly as-well. Without this patch, users will have the replace the content of the rust-toolchain file because it is prioritized over the input. It makes a lot more sense to prioritize the input over the file because that one is easier changed.
This commit is contained in:
parent
9cf95ed753
commit
568a53bc9a
5 changed files with 38 additions and 14 deletions
29
src/args.ts
29
src/args.ts
|
@ -28,15 +28,24 @@ export function toolchain_args(overrideFile: string): ToolchainOptions {
|
|||
}
|
||||
|
||||
function determineToolchain(overrideFile: string): string {
|
||||
if (existsSync(overrideFile)) {
|
||||
debug(`using toolchain override from ${overrideFile}`);
|
||||
const content = readFileSync(overrideFile, {
|
||||
encoding: "utf-8",
|
||||
flag: "r"
|
||||
});
|
||||
return content.trim();
|
||||
} else {
|
||||
debug(`toolchain override file ${overrideFile} does not exist, falling back to input variable`);
|
||||
return input.getInput('toolchain', {required: true})
|
||||
|
||||
const toolchainInput = input.getInput('toolchain', {required: false});
|
||||
|
||||
if (toolchainInput) {
|
||||
debug(`using toolchain from input: ${toolchainInput}`);
|
||||
return toolchainInput
|
||||
}
|
||||
|
||||
if (!existsSync(overrideFile)) {
|
||||
throw new Error("toolchain input was not given and repository does not have a rust-toolchain file")
|
||||
}
|
||||
|
||||
const rustToolchainFile = readFileSync(overrideFile, {
|
||||
encoding: "utf-8",
|
||||
flag: "r"
|
||||
}).trim();
|
||||
|
||||
debug(`using toolchain from rust-toolchain file: ${rustToolchainFile}`);
|
||||
|
||||
return rustToolchainFile;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue