@docupace/pipeline 1.0.51 → 1.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/changeset/cli.js

@@ -4,7 +4,11 @@ import { $ } from 'zx';
 import { validateChangesets } from './validate.js';
 import dotenv from 'dotenv';
 import { isMonoRepo, setGitInfo } from '../next/util.js';
-import { updateJiraWithVersion, versionCommand } from './version.js';
+import {
+  toShortVersion,
+  updateJiraWithVersion,
+  versionCommand,
+} from './version.js';
 import { createChangeset } from './create.js';
 
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
@@ -157,12 +161,20 @@ program
     if (isMonoRepo()) {
       for (const release of getAppReleases(releases)) {
         const appName = getAppNameFromPackageName(release.name);
-        await $`git checkout -b release/${appName}/${release.newVersion}`;
-        await $`git push origin release/${appName}/${release.newVersion}`;
+        const newVersion = toShortVersion(release.newVersion);
+        if (!newVersion) {
+          throw new Error('Error calculating branch name');
+        }
+        await $`git checkout -b release/${appName}/${newVersion}`;
+        await $`git push origin release/${appName}/${newVersion}`;
       }
     } else {
-      await $`git checkout -b release/${releases[0].newVersion}`;
-      await $`git push origin release/${releases[0].newVersion}`;
+      const newVersion = toShortVersion(releases[0].newVersion);
+      if (!newVersion) {
+        throw new Error('Error calculating branch name');
+      }
+      await $`git checkout -b release/${newVersion}`;
+      await $`git push origin release/${newVersion}`;
     }
 
     // Return to original branch

package/src/changeset/version.js

@@ -4,6 +4,7 @@ import fs from 'fs';
 import { updateComponentVersion } from '../next/jira.js';
 import { findJiraTicketId } from './util.js';
 import { revertBaseBranch, updateBaseBranch } from './changeset-config.js';
+import semver from 'semver';
 
 const changeSetPackage = `{
   "name": "changeset-package",
@@ -22,6 +23,12 @@ const changeSetPackage = `{
 }
 `;
 
+export function toShortVersion(version) {
+  const parsed = semver.parse(version);
+  if (!parsed) return null;
+  return `${parsed.major}.${parsed.minor}`;
+}
+
 export async function versionStatus(sinceBranch) {
   const outputPath = './changeset-output.json';