From d4211fcd75a463c9d57fb9e13d8b5b98231340a5 Mon Sep 17 00:00:00 2001
From: Dan Allen <dan@opendevise.com>
Date: Tue, 21 Nov 2023 04:39:30 -0700
Subject: [PATCH] extract tag prefix and account for different latest tag alias
 in release task

---
 gulp.d/tasks/release.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gulp.d/tasks/release.js b/gulp.d/tasks/release.js
index ed33f96..dd70db3 100644
--- a/gulp.d/tasks/release.js
+++ b/gulp.d/tasks/release.js
@@ -11,14 +11,13 @@ const map = (transform, flush = undefined) => new Transform({ objectMode: true,
 const vfs = require('vinyl-fs')
 const zip = require('@vscode/gulp-vinyl-zip')
 
-function getNextReleaseNumber ({ octokit, owner, repo, variant }) {
-  const prefix = `${variant}-`
-  const filter = ({ name }) => name.startsWith(prefix) && !name.endsWith('-latest')
+function getNextReleaseNumber ({ octokit, owner, repo, tagPrefix, latestTagName }) {
+  const filter = ({ name }) => name !== latestTagName && name.startsWith(tagPrefix)
   return collectReleases({ octokit, owner, repo, filter }).then((releases) => {
     if (releases.length) {
       releases.sort((a, b) => -1 * a.name.localeCompare(b.name, 'en', { numeric: true }))
       const latestName = releases[0].name
-      return Number(latestName.slice(prefix.length)) + 1
+      return Number(latestName.slice(tagPrefix.length)) + 1
     } else {
       return 1
     }
@@ -80,8 +79,9 @@ module.exports = (dest, bundleName, owner, repo, ref, token, updateBranch, lates
   let variant = ref ? ref.replace(/^refs\/heads\//, '') : 'main'
   if (variant === 'main') variant = 'prod'
   ref = ref.replace(/^refs\//, '')
-  const tagName = `${variant}-${await getNextReleaseNumber({ octokit, owner, repo, variant })}`
-  const latestTagName = latestAlias === false ? undefined : `${variant}-${latestAlias || 'latest'}`
+  const tagPrefix = `${variant}-`
+  const latestTagName = latestAlias === false ? undefined : `${tagPrefix}${latestAlias || 'latest'}`
+  const tagName = `${tagPrefix}${await getNextReleaseNumber({ octokit, owner, repo, tagPrefix, latestTagName })}`
   const message = `Release ${tagName}`
   const bundleFileBasename = `${bundleName}-bundle.zip`
   const bundleFile = await versionBundle(ospath.join(dest, bundleFileBasename), tagName)