adding utility to check if a git tag exists, rather than just checking if a version is published to an npm feed to make tagging more robust

chaseholland · chaseholland · commit d96c8b381556 · 2019-11-21T17:35:35.000-08:00
diff --git a/apps/rush-lib/src/cli/actions/PublishAction.ts b/apps/rush-lib/src/cli/actions/PublishAction.ts
@@ -324,18 +324,20 @@ export class PublishAction extends BaseRushAction {
             return;
           }
 
-          // Do not tag packages that already exist. This will fail with a fatal error.
-          if (this._packageExists(packageConfig)) {
+          // Do not create a new tag if one already exists, this will result in a fatal error
+          if (git.hasTag(packageConfig)) {
+            console.log(`Not tagging ${packageName}@${packageConfig.packageJson.version}. A tag already exists for this version.`);
             return;
           }
 
-          git.addTag(!!this._publish.value && !this._registryUrl.value, packageName, packageConfig.packageJson.version);
+          git.addTag(!!this._publish.value, packageName, packageConfig.packageJson.version);
           updated = true;
         };
 
         if (this._pack.value) {
           // packs to tarball instead of publishing to NPM repository
           this._npmPack(packageName, packageConfig);
+          // Do not tag packages that already exist. This will fail with a fatal error.
           applyTag(this._applyGitTagsOnPack.value);
         } else if (this._force.value || !this._packageExists(packageConfig)) {
           // Publish to npm repository
diff --git a/apps/rush-lib/src/logic/PublishGit.ts b/apps/rush-lib/src/logic/PublishGit.ts
@@ -2,6 +2,8 @@
 // See LICENSE in the project root for license information.
 
 import { PublishUtilities } from './PublishUtilities';
+import { Utilities } from '../utilities/Utilities';
+import { RushConfigurationProject } from '../api/RushConfigurationProject';
 
 export class PublishGit {
   private _targetBranch: string | undefined;
@@ -51,6 +53,19 @@ export class PublishGit {
       ['tag', '-a', tagName, '-m', `${packageName} v${packageVersion}`]);
   }
 
+  public hasTag(packageConfig: RushConfigurationProject): boolean {
+    const tagName: string = PublishUtilities.createTagname(packageConfig.packageName, packageConfig.packageJson.version);
+    const tagOutput: string = Utilities.executeCommandAndCaptureOutput(
+      'git',
+      ['tag', '-l', tagName],
+      packageConfig.projectFolder,
+      PublishUtilities.getEnvArgs(),
+      true
+    ).replace(/(\r\n|\n|\r)/gm, '');
+
+    return tagOutput === tagName;
+  }
+
   public commit(commitMessage: string): void {
     PublishUtilities.execCommand(!!this._targetBranch, 'git', ['commit', '-m', commitMessage]);
   }
