Merge pull request #11 from Osspial/windows-uninstall-default-stable

Remove default stable install on Windows
hecrj · Dec 4, 2019 · a6bcfcc · a6bcfcc
2 parents a82cf6b + de871ef
commit a6bcfcc
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 5 deletions.
diff --git a/lib/rustup.js b/lib/rustup.js
@@ -35,6 +35,27 @@ function install() {
             // to leverage newer features like "latest latest compatible nightly"
             yield exec.exec('rustup', ['self', 'update']);
             yield exec.exec('rustup', ['set', 'profile', 'minimal']);
+            if (os.platform() == 'win32') {
+                let cargoPath = '';
+                {
+                    const options = {
+                        listeners: {
+                            stdout: (data) => {
+                                cargoPath += data.toString();
+                            }
+                        }
+                    };
+                    yield exec.exec('where', ['rustup.exe'], options);
+                }
+                let rustupPath = cargoPath.split('\\').slice(0, -3).concat([".rustup"]).join("\\");
+                let defaultClearedFilePath = `${rustupPath}\\default_cleared`;
+                if (!fs_1.existsSync(defaultClearedFilePath)) {
+                    // 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.
+                    fs_1.renameSync(`${rustupPath}\\toolchains`, `${rustupPath}\\_toolchains`);
+                    fs_1.appendFileSync(defaultClearedFilePath, '');
+                }
+            }
         }
     });
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@types/jest": "^24.0.13",
-    "@types/node": "^12.0.4",
+    "@types/node": "^12.12.14",
     "@types/semver": "^6.0.0",
     "jest": "^24.8.0",
     "jest-circus": "^24.7.1",

diff --git a/src/rustup.ts b/src/rustup.ts
@@ -3,7 +3,7 @@ import * as exec from '@actions/exec';
 import * as toolCache from '@actions/tool-cache';
 import * as path from 'path';
 import * as os from 'os';
-import {chmodSync} from 'fs';
+import {chmodSync, renameSync, existsSync, appendFileSync} from 'fs';
 
 let tempDirectory = process.env['RUNNER_TEMPDIRECTORY'] || '';
 
@@ -20,6 +20,29 @@ export async function install() {
     await exec.exec('rustup', ['self', 'update']);
 
     await exec.exec('rustup', ['set', 'profile', 'minimal']);
+
+    if (os.platform() == 'win32') {
+      let cargoPath = '';
+      {
+        const options = {
+          listeners: {
+            stdout: (data: Buffer) => {
+              cargoPath += data.toString();
+            }
+          }
+        };
+        await exec.exec('where', ['rustup.exe'], options);
+      }
+      let rustupPath = cargoPath.split('\\').slice(0, -3).concat([".rustup"]).join("\\");
+      let defaultClearedFilePath = `${rustupPath}\\default_cleared`;
+
+      if (!existsSync(defaultClearedFilePath)) {
+        // 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.
+        renameSync(`${rustupPath}\\toolchains`, `${rustupPath}\\_toolchains`);
+        appendFileSync(defaultClearedFilePath, '');
+      }
+    }
   }
 }