Merge pull request microsoft#1639 from chaseholland/master

iclanton · web-flow · commit 59f7213cbf4d · 2019-11-25T16:28:04.000-08:00
[rush] Fix applying git tags when using --pack --apply-git-tags-on-pack and using publish --include-all
diff --git a/apps/rush-lib/src/cli/actions/PublishAction.ts b/apps/rush-lib/src/cli/actions/PublishAction.ts
@@ -324,12 +324,15 @@ export class PublishAction extends BaseRushAction {
             return;
           }
 
-          // Do not tag packages that already exist. This will fail with a fatal error.
-          if (this._packageExists(packageConfig)) {
+          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}@${packageVersion}. 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, packageVersion);
           updated = true;
         };
 
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,22 @@ 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]);
   }
diff --git a/common/changes/@microsoft/rush/master_2019-11-22-21-16.json b/common/changes/@microsoft/rush/master_2019-11-22-21-16.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Resolve an issue where git tags were not being applied when using pack or publish with --include-all",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "chaseholland@users.noreply.github.com"
+}
