From 95a77582bbdeb47e9b20331367892743c8dc9deb Mon Sep 17 00:00:00 2001 From: Osspial Date: Wed, 4 Dec 2019 00:47:58 -0500 Subject: [PATCH] Uninstall the default profile on Windows --- lib/main.js | 3 ++- lib/rustup.js | 6 +++++- node_modules/.bin/uuid | 2 +- node_modules/.bin/which | 2 +- src/rustup.ts | 3 +++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/main.js b/lib/main.js index a169eeb..f390ba3 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,9 +1,10 @@ "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; diff --git a/lib/rustup.js b/lib/rustup.js index e3d06ee..bb79ace 100644 --- a/lib/rustup.js +++ b/lib/rustup.js @@ -1,9 +1,10 @@ "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; @@ -35,6 +36,9 @@ function install() { // to leverage newer features like "latest latest compatible nightly" yield exec.exec('rustup', ['self', 'update']); yield exec.exec('rustup', ['set', 'profile', 'minimal']); + // Github's default Windows install comes with rustup pre-installed with stable, including + // rust-docs. This removes the default stable install so that it doesn't update rust-docs. + yield exec.exec('rustup', ['toolchain', 'uninstall', 'stable']); } }); } diff --git a/node_modules/.bin/uuid b/node_modules/.bin/uuid index b3e45bc..df26561 120000 --- a/node_modules/.bin/uuid +++ b/node_modules/.bin/uuid @@ -1 +1 @@ -../uuid/bin/uuid \ No newline at end of file +../uuid/bin/uuid diff --git a/node_modules/.bin/which b/node_modules/.bin/which index f62471c..fa2db9f 120000 --- a/node_modules/.bin/which +++ b/node_modules/.bin/which @@ -1 +1 @@ -../which/bin/which \ No newline at end of file +../which/bin/which diff --git a/src/rustup.ts b/src/rustup.ts index 1613512..f94821e 100644 --- a/src/rustup.ts +++ b/src/rustup.ts @@ -20,6 +20,9 @@ export async function install() { await exec.exec('rustup', ['self', 'update']); await exec.exec('rustup', ['set', 'profile', 'minimal']); + // Github's default Windows install comes with rustup pre-installed with stable, including + // rust-docs. This removes the default stable install so that it doesn't update rust-docs. + await exec.exec('rustup', ['toolchain', 'uninstall', 'stable']); } }