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 d4e9f48fccb4 · 2019-11-22T13:08:41.000-08:00
diff --git a/apps/rush-lib/src/cli/actions/PublishAction.ts b/apps/rush-lib/src/cli/actions/PublishAction.ts
@@ -324,13 +324,15 @@ export class PublishAction extends BaseRushAction {
             return;
           }
 
+          const packageVersion: string = packageConfig.packageJson.version;
+
           // 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.`);
+            console.log(`Not tagging ${packageName}@${packageVersion}. A tag already exists for this version.`);
             return;
           }
 
-          git.addTag(!!this._publish.value, packageName, packageConfig.packageJson.version);
+          git.addTag(!!this._publish.value, packageName, packageVersion);
           updated = true;
         };
 
diff --git a/apps/rush-lib/src/logic/PublishGit.ts b/apps/rush-lib/src/logic/PublishGit.ts
@@ -54,7 +54,10 @@ export class PublishGit {
   }
 
   public hasTag(packageConfig: RushConfigurationProject): boolean {
-    const tagName: string = PublishUtilities.createTagname(packageConfig.packageName, packageConfig.packageJson.version);
+    const tagName: string = PublishUtilities.createTagname(
+      packageConfig.packageName,
+      packageConfig.packageJson.version
+    );
     const tagOutput: string = Utilities.executeCommandAndCaptureOutput(
       'git',
       ['tag', '-l', tagName],
