fix: skip existing git tags for private pkgs

changesets · Apr 14, 2021 · 2147633 · 2147633
1 parent cc409aa
commit 2147633
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/cli/src/commands/publish/index.ts b/packages/cli/src/commands/publish/index.ts
@@ -79,8 +79,13 @@ export default async function run(
     if (tool !== "root") {
       for (const pkg of successful) {
         const tag = `${pkg.name}@${pkg.newVersion}`;
-        log("New tag: ", tag);
-        await git.tag(tag, cwd);
+        const isMissingTag = !(await git.tagExists(tag));
+        if (isMissingTag) {
+          log("New tag: ", tag);
+          await git.tag(tag, cwd);
+        } else {
+          log("Skipping existing tag: ", tag);
+        }
       }
     } else {
       const tag = `v${successful[0].newVersion}`;

diff --git a/packages/git/src/index.ts b/packages/git/src/index.ts
@@ -34,6 +34,13 @@ async function tag(tagStr: string, cwd: string) {
   return gitCmd.code === 0;
 }
 
+async function tagExists(tagStr: string) {
+  const gitCmd = await spawn("git", ["tag", "-l", tagStr]);
+  const output = gitCmd.stdout.toString().trim();
+  const tagExists = !!output;
+  return tagExists;
+}
+
 // Find the commit where we diverged from `ref` at using `git merge-base`
 export async function getDivergedCommit(cwd: string, ref: string) {
   const cmd = await spawn("git", ["merge-base", ref, "HEAD"], { cwd });
@@ -259,6 +266,7 @@ export {
   add,
   commit,
   tag,
+  tagExists,
   getChangedPackagesSinceRef,
   getChangedChangesetFilesSinceRef
 };