Release CLI Fixes (#490)

* Add --skipRebuild and --skipTests flags

* Temporary: Target localhost NPM server

* Refactor git push step

* Refactor to push to current branch

* Refactor commitAndTag fxn

* Adding some logging

* Refactor tag pushing

* Revert "Temporary: Target localhost NPM server"

This reverts commit dd4ab71.

* [AUTOMATED]: Prettier Code Styling

* Comments from @hiranya911

Author: jshcrowthe

scripts/release/cli.js

@@ -154,11 +154,16 @@ const { argv } = require('yargs');
     await updateWorkspaceVersions(versions, argv.canary);
 
     /**
-     * Clean install dependencies
+     * Users can pass --skipRebuild to skip the rebuild step
      */
-    console.log('\r\nVerifying Build');
-    await cleanTree();
-    await reinstallDeps();
+    if (!argv.skipRebuild) {
+      /**
+       * Clean install dependencies
+       */
+      console.log('\r\nVerifying Build');
+      await cleanTree();
+      await reinstallDeps();
+    }
 
     /**
      * Don't do the following for canary releases:
@@ -171,8 +176,14 @@ const { argv } = require('yargs');
       /**
        * Ensure all tests are passing
        */
-      await setupTestDeps();
-      await runTests();
+
+      /**
+       * Users can pass --skipTests to skip the testing step
+       */
+      if (!argv.skipTests) {
+        await setupTestDeps();
+        await runTests();
+      }
 
       const { readyToPush } = await prompt(validateReadyToPush);
       if (!readyToPush) throw new Error('Push Check Failed');
@@ -184,12 +195,12 @@ const { argv } = require('yargs');
         /**
          * Commit the version changes and tag the associated versions
          */
-        await commitAndTag(versions, releaseType);
+        const tags = await commitAndTag(versions, releaseType);
 
         /**
          * Push new version to Github
          */
-        await pushUpdatesToGithub();
+        await pushUpdatesToGithub(tags);
       }
     }
 

scripts/release/utils/git.js

@@ -30,23 +30,40 @@ exports.cleanTree = async () => {
   });
 };
 
-exports.commitAndTag = async (updatedVersions, releaseType) => {
-  await git.add('*/package.json');
-  await git.commit(
-    releaseType === 'Staging' ? 'Publish Prerelease' : 'Publish'
+/**
+ * Commits the current state of the repository and tags it with the appropriate
+ * version changes.
+ *
+ * Returns the tagged commits
+ */
+exports.commitAndTag = async updatedVersions => {
+  await exec('git add */package.json');
+
+  let result = await exec(
+    `git commit -m "Publish firebase@${updatedVersions.firebase}"`
   );
-  Object.keys(updatedVersions)
-    .map(name => ({ name, version: updatedVersions[name] }))
-    .forEach(async ({ name, version }) => {
-      await git.addTag(`${name}@${version}`);
-    });
+
+  const tags = [];
+  await Promise.all(
+    Object.keys(updatedVersions)
+      .map(name => ({ name, version: updatedVersions[name] }))
+      .map(async ({ name, version }) => {
+        const tag = `${name}@${version}`;
+        const result = await exec(`git tag ${tag}`);
+        tags.push(tag);
+      })
+  );
+  return tags;
 };
 
-exports.pushUpdatesToGithub = async () => {
-  await git.push('origin', 'master', {
-    '--follow-tags': null,
-    '--no-verify': null
-  });
+exports.pushUpdatesToGithub = async tags => {
+  let { stdout: currentBranch, stderr } = await exec(
+    `git rev-parse --abbrev-ref HEAD`
+  );
+  currentBranch = currentBranch.trim();
+
+  await exec(`git push origin ${currentBranch} --no-verify -u`, { cwd: root });
+  await exec(`git push origin ${tags.join(' ')}`);
 };
 
 exports.resetWorkingTree = async () => {