refactor: dist tags to git tags opt

prisma-labs · Feb 19, 2020 · bbf5c71 · bbf5c71
1 parent b09c2c5
commit bbf5c71
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/src/cli/commands/preview.ts b/src/cli/commands/preview.ts
@@ -109,14 +109,12 @@ export class Preview extends Command {
           distTag: 'next',
           version: release.version.version,
         },
-        { skipNPM: flags['skip-npm'] }
+        {
+          skipNPM: flags['skip-npm'],
+          gitTagForDistTags: true,
+        }
       )
 
-      // force update so the tag moves to a new commit
-      await git.raw(['tag', '-f', 'next'])
-      await git.raw(['push', 'origin', ':refs/tags/next'])
-      await git.raw(['push', '--tags'])
-      console.log('updated git-tag "next"')
       return
     }
 

diff --git a/src/cli/commands/stable.ts b/src/cli/commands/stable.ts
@@ -59,16 +59,11 @@ export class Stable extends Command {
         distTag: 'latest',
         additiomalDistTags: ['next'],
       },
-      { skipNPM: flags['skip-npm'] }
+      {
+        skipNPM: flags['skip-npm'],
+        gitTagForDistTags: true,
+      }
     )
-
-    // force update so the tag moves to a new commit
-    await git.raw(['tag', '-f', 'latest'])
-    await git.raw(['tag', '-f', 'next'])
-    // https://stackoverflow.com/questions/8044583/how-can-i-move-a-tag-on-a-git-branch-to-a-different-commit
-    await git.raw(['push', 'origin', ':refs/tags/latest', ':refs/tags/next'])
-    await git.raw(['push', '--tags'])
-    console.log('updated git-tags "latest" "next"')
   }
 }
 

diff --git a/src/utils/publish.ts b/src/utils/publish.ts
@@ -11,11 +11,16 @@ type Options = {
    */
   gitTagVPrefix?: boolean
   skipNPM?: boolean
+  /**
+   * Should each given dist tag have a corresponding git tag made?
+   */
+  gitTagForDistTags?: boolean
 }
 
 const defaultOpts: Options = {
   gitTagVPrefix: false,
   skipNPM: false,
+  gitTagForDistTags: true,
 }
 
 type Release = {
@@ -90,6 +95,23 @@ export async function publish(release: Release, givenOpts?: Options) {
   await git.addAnnotatedTag(versionTag, versionTag)
   console.log(`tagged this commit with ${versionTag}`)
 
+  // Tag the git commit with the given dist tag names
+  //
+  if (opts.gitTagForDistTags) {
+    // todo parallel optimize?
+    const distTags = [release.distTag, ...(release.additiomalDistTags ?? [])]
+    for (const distTag of distTags) {
+      // dist tags are movable pointers. Except for init case it is expected to
+      // exist in the git repo. So use force to move the tag.
+      // https://stackoverflow.com/questions/8044583/how-can-i-move-a-tag-on-a-git-branch-to-a-different-commit
+      // todo provide nice semantic descriptions for each dist tag
+      await git.raw(['tag', '--force', '--message', distTag, distTag])
+      await git.raw(['push', 'origin', `:refs/tags/${distTag}`])
+      console.log('updated git tag %j', distTag)
+    }
+    await git.raw(['push', '--tags'])
+  }
+
   // Push the git commits
   //
   await git.pushTags()