Clean up in general

This commit is contained in:
Héctor Ramón Jiménez
2019-08-16 02:16:04 +02:00
parent b6def3913c
commit d70a4279cf
4 changed files with 12 additions and 21 deletions

View File

@@ -8,7 +8,7 @@ async function run() {
const version = core.getInput('rust-version');
if(version) {
await rustup.install(version);
await rustup.install();
await exec.exec('rustup', ['default', version]);
await exec.exec('rustup', ['update', version]);
}

View File

@@ -8,30 +8,21 @@ import {chmodSync} from 'fs';
let tempDirectory = process.env['RUNNER_TEMPDIRECTORY'] || '';
export async function install(version: string) {
export async function install() {
// `rustup` is already installed in
if (os.platform() == 'darwin') {
let toolPath = await acquireRust(version);
core.debug('Rust toolchain is cached under ' + toolPath);
let toolPath = await installOnUnix();
core.debug('rustup is located under: ' + toolPath);
core.addPath(path.join(toolPath, 'bin'));
}
}
async function acquireRust(version: string): Promise<string> {
let script: string;
try {
script = await toolCache.downloadTool("https://sh.rustup.rs");
} catch (error) {
core.debug(error);
throw `Failed to download rustup: ${error}`;
}
async function installOnUnix(): Promise<string> {
let script = await toolCache.downloadTool("https://sh.rustup.rs");
chmodSync(script, '777');
await exec.exec(`"${script}"`, ['-y', '--default-toolchain', 'none']);
let cargo = path.join(process.env['HOME'] || '', '.cargo');
return await toolCache.cacheDir(cargo, 'rust', version);
return path.join(process.env['HOME'] || '', '.cargo');
}