Merge branch 'nichtich-token' into production

gjtorikian · Jun 16, 2020 · 99b16a2 · 99b16a2
2 parents fd85c1f + 680380b
commit 99b16a2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -31,4 +31,10 @@ OPTIONS
 
     Note: this step will fail if branch protections are enabled
 
+## Configuration
+
 If you have `core.defaultBranch` set, the script will use that branch name as its default.
+
+A GitHub API token can also be provided via the `GITHUB_TOKEN` environment variable.
+
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.js b/src/index.js
@@ -78,11 +78,13 @@ class NoMoreMastersCommand extends Command {
       return;
     }
 
-    const token = await cli.prompt("What is your GitHub API token?", {
-      type: "hide",
-    });
+    const token =
+      process.env.GITHUB_TOKEN ||
+      (await cli.prompt("What is your GitHub API token?", {
+        type: "hide",
+      }));
 
-    this.log("Fetching origin...");
+    this.log("\nFetching origin...");
     try {
       await execa("git", ["fetch", "origin"]);
     } catch (error) {