@leverege/build-tools 2.33.1 → 2.33.2-bruno.2

package/.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+  "eslint.alwaysShowStatus": true,
+  "[javascript]": {
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": true,
+      "source.organizeImports": false
+    }
+  },
+  "[javascriptreact]": {
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": true,
+      "source.organizeImports": false
+    }
+  },
+}

package/lib/server/tag-release.js

@@ -211,16 +211,26 @@ The tag-release script must run from a npm project.
   return packageJson.version;
 };
 const getNextVersions = currentVersion => {
-  const [major, minor, patch, beta] = currentVersion.split(/\.|-beta\./).map(Number);
+  const regex = /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-(\w+)\.(\d+))?$/i;
+  const [, dirtyMajor, dirtyMinor, dirtyPatch, testTag, dirtyTestVersion] = currentVersion.match(regex);
+  const major = parseInt(dirtyMajor);
+  const minor = parseInt(dirtyMinor) || 0;
+  const patch = parseInt(dirtyPatch) || 0;
+  const testVersion = parseInt(dirtyTestVersion) || 0;
   const nextMajor = `${major + 1}.0.0`;
   const nextMinor = `${major}.${minor + 1}.0`;
   const nextPatch = `${major}.${minor}.${patch + 1}`;
-  const nextBeta = beta ? `${major}.${minor}.${patch}-beta.${beta + 1}` : `${major}.${minor}.${patch + 1}-beta.1`;
+  const nextAlpha = testTag === 'alpha' ? `${major}.${minor}.${patch}-alpha.${testVersion + 1}` : `${major}.${minor}.${patch + 1}-alpha.1`;
+  const nextBeta = testTag === 'beta' ? `${major}.${minor}.${patch}-beta.${testVersion + 1}` : `${major}.${minor}.${patch + 1}-beta.1`;
+  const nextTestTag = testTag && !['alpha', 'beta'].includes(testTag) ? `${major}.${minor}.${patch}-${testTag}.${testVersion + 1}` : null;
   return {
     nextMajor,
     nextMinor,
     nextPatch,
-    nextBeta
+    nextAlpha,
+    nextBeta,
+    nextTestTag,
+    testTag
   };
 };
 const promptForVersion = async currentVersion => {
@@ -228,7 +238,10 @@ const promptForVersion = async currentVersion => {
     nextMajor,
     nextMinor,
     nextPatch,
-    nextBeta
+    nextAlpha,
+    nextBeta,
+    nextTestTag,
+    testTag
   } = getNextVersions(currentVersion);
   const choices = [{
     hint: '(major release)',
@@ -239,10 +252,16 @@ const promptForVersion = async currentVersion => {
   }, {
     hint: '(patch release)',
     value: nextPatch
+  }, {
+    hint: '(alpha release)',
+    value: nextAlpha
   }, {
     hint: '(beta release)',
     value: nextBeta
-  }, {
+  }, ...(nextTestTag ? [{
+    hint: `(${testTag} release)`,
+    value: nextTestTag
+  }] : []), {
     hint: '(current version)',
     value: currentVersion
   }, {
@@ -302,6 +321,19 @@ const getGitTagSuffix = async () => {
   });
   return tagSuffix;
 };
+const getGitAnnotationMessage = async ({
+  tagName
+}) => {
+  const {
+    annotationMessage
+  } = await prompt({
+    type: 'input',
+    name: 'annotationMessage',
+    message: 'What annotation message would you like to add to git tag?',
+    initial: tagName
+  });
+  return annotationMessage;
+};
 const confirmPushCommit = async buildMessage => {
   const {
     confirm
@@ -425,19 +457,19 @@ const commitAndPushNewBuild = async config => {
   await createNewBuildCommit(config);
   await pushToGitRemote();
 };
-const confirmPushTag = async tagName => {
+const confirmPushTag = async (tagName, annotationMessage) => {
   const {
     confirm
   } = await prompt([{
     type: 'confirm',
     name: 'confirm',
-    message: `${_ansiColors.default.bold.red('[Warning]')} Push new tag ${_ansiColors.default.bold.yellow(tagName)} to git remote?`
+    message: `${_ansiColors.default.bold.red('[Warning]')} Push new tag ${_ansiColors.default.bold.yellow(tagName)} with annotation message "${_ansiColors.default.bold.yellow(annotationMessage)}" to git remote?`
   }]);
   return confirm;
 };
-const createGitTag = async tagName => {
+const createGitTag = async (tagName, annotationMessage) => {
   try {
-    await (0, _zx.$)`git tag ${tagName}`;
+    await (0, _zx.$)`git tag -a ${tagName} -m "${annotationMessage}"`;
   } catch (err) {
     console.log(err.stderr || err);
     process.exit(1);
@@ -453,11 +485,12 @@ const pushGitTag = async tagName => {
 };
 const createAndPushGitTag = async ({
   tagName,
+  annotationMessage,
   noConfirm
 }) => {
-  const confirmAnswer = noConfirm || (await confirmPushTag(tagName));
+  const confirmAnswer = noConfirm || (await confirmPushTag(tagName, annotationMessage));
   if (confirmAnswer) {
-    await createGitTag(tagName);
+    await createGitTag(tagName, annotationMessage);
     await pushGitTag(tagName);
   }
 };
@@ -497,9 +530,11 @@ const displayReleaseInfo = config => {
     packagePath,
     buildMessage,
     tagName,
+    annotationMessage,
     publishable,
     npmjsTag,
-    isBetaRelease
+    isBetaRelease,
+    noGitTag
   } = config;
   console.log(`
 
@@ -509,8 +544,9 @@ ${_ansiColors.default.blue('Version:')} ${version}
 ${_ansiColors.default.blue('Root directory:')} ${repositoryRoot}
 ${_ansiColors.default.blue('Package name:')} ${packageName}
 ${_ansiColors.default.blue('package.json path:')} ${_path.default.join(packagePath, 'package.json')}${buildMessage ? `
-${_ansiColors.default.blue('Commit message:')} ${buildMessage}` : ''}${isBetaRelease ? '' : `
-${_ansiColors.default.blue('Git tag:')} ${tagName}`}${publishable ? `
+${_ansiColors.default.blue('Commit message:')} ${buildMessage}` : ''}${isBetaRelease || noGitTag ? '' : `
+${_ansiColors.default.blue('Git tag:')} ${tagName}`}${isBetaRelease || noGitTag ? '' : `
+${_ansiColors.default.blue('Git tag annotation:')} ${annotationMessage}`}${publishable ? `
 ${_ansiColors.default.blue('Npmjs tag:')} ${npmjsTag}` : ''}
 ${_ansiColors.default.bold.green('=============================================')}
 `);
@@ -551,6 +587,11 @@ const optionList = [{
   type: String,
   alias: 't',
   description: 'tag suffix to be appended to the version when pushing to git'
+}, {
+  name: 'annotation-message',
+  type: String,
+  alias: 'm',
+  description: 'annotation message that will annotate the git tag'
 }, {
   name: 'branch-filter',
   type: String,
@@ -560,6 +601,10 @@ const optionList = [{
   name: 'no-commit',
   type: Boolean,
   description: 'do not create a new commit on git (in case the goal is just tagging it)'
+}, {
+  name: 'no-git-tag',
+  type: Boolean,
+  description: 'do not create a new tag on git'
 }, {
   name: 'no-confirm',
   type: Boolean,
@@ -589,6 +634,7 @@ validateArgs(args);
 const config = {};
 config.noConfirm = !!args['no-confirm'];
 config.noCommit = !!args['no-commit'];
+config.noGitTag = !!args['no-git-tag'];
 config.repositoryRoot = await getGitRootDirectory();
 config.branch = args.branch || (await getBranch({
   branchFilter: args['branch-filter']
@@ -601,10 +647,12 @@ config.version = args.version || (await getVersion(config));
 config.packageName = await getPackageName(config);
 config.buildMessage = config.noCommit ? '' : getBuildMessage(config);
 config.isBetaRelease = config.version.includes('-beta.');
-if (!config.isBetaRelease) {
+if (!config.isBetaRelease && !config.noGitTag) {
   const tagSuffix = args['tag-suffix'] ?? (await getGitTagSuffix());
   const tagPrefix = config.isPackageInRepositoryRoot ? '' : `${config.packageName}/`;
   config.tagName = `${tagPrefix}v${config.version}${tagSuffix}`;
+  const annotationMessage = args['annotation-message'] ?? (await getGitAnnotationMessage(config));
+  config.annotationMessage = annotationMessage;
 }
 config.publishable = !!args.publishable;
 if (config.publishable) {
@@ -624,7 +672,7 @@ if (!config.noConfirm) {
 if (!config.noCommit) {
   await commitAndPushNewBuild(config);
 }
-if (!config.isBetaRelease) {
+if (!config.isBetaRelease && !config.noGitTag) {
   await createAndPushGitTag(config);
 }
 if (config.publishable) {

package/lib/web/tag-release.js

@@ -211,16 +211,26 @@ The tag-release script must run from a npm project.
   return packageJson.version;
 };
 const getNextVersions = currentVersion => {
-  const [major, minor, patch, beta] = currentVersion.split(/\.|-beta\./).map(Number);
+  const regex = /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-(\w+)\.(\d+))?$/i;
+  const [, dirtyMajor, dirtyMinor, dirtyPatch, testTag, dirtyTestVersion] = currentVersion.match(regex);
+  const major = parseInt(dirtyMajor);
+  const minor = parseInt(dirtyMinor) || 0;
+  const patch = parseInt(dirtyPatch) || 0;
+  const testVersion = parseInt(dirtyTestVersion) || 0;
   const nextMajor = `${major + 1}.0.0`;
   const nextMinor = `${major}.${minor + 1}.0`;
   const nextPatch = `${major}.${minor}.${patch + 1}`;
-  const nextBeta = beta ? `${major}.${minor}.${patch}-beta.${beta + 1}` : `${major}.${minor}.${patch + 1}-beta.1`;
+  const nextAlpha = testTag === 'alpha' ? `${major}.${minor}.${patch}-alpha.${testVersion + 1}` : `${major}.${minor}.${patch + 1}-alpha.1`;
+  const nextBeta = testTag === 'beta' ? `${major}.${minor}.${patch}-beta.${testVersion + 1}` : `${major}.${minor}.${patch + 1}-beta.1`;
+  const nextTestTag = testTag && !['alpha', 'beta'].includes(testTag) ? `${major}.${minor}.${patch}-${testTag}.${testVersion + 1}` : null;
   return {
     nextMajor,
     nextMinor,
     nextPatch,
-    nextBeta
+    nextAlpha,
+    nextBeta,
+    nextTestTag,
+    testTag
   };
 };
 const promptForVersion = async currentVersion => {
@@ -228,7 +238,10 @@ const promptForVersion = async currentVersion => {
     nextMajor,
     nextMinor,
     nextPatch,
-    nextBeta
+    nextAlpha,
+    nextBeta,
+    nextTestTag,
+    testTag
   } = getNextVersions(currentVersion);
   const choices = [{
     hint: '(major release)',
@@ -239,10 +252,16 @@ const promptForVersion = async currentVersion => {
   }, {
     hint: '(patch release)',
     value: nextPatch
+  }, {
+    hint: '(alpha release)',
+    value: nextAlpha
   }, {
     hint: '(beta release)',
     value: nextBeta
-  }, {
+  }, ...(nextTestTag ? [{
+    hint: `(${testTag} release)`,
+    value: nextTestTag
+  }] : []), {
     hint: '(current version)',
     value: currentVersion
   }, {
@@ -302,6 +321,19 @@ const getGitTagSuffix = async () => {
   });
   return tagSuffix;
 };
+const getGitAnnotationMessage = async ({
+  tagName
+}) => {
+  const {
+    annotationMessage
+  } = await prompt({
+    type: 'input',
+    name: 'annotationMessage',
+    message: 'What annotation message would you like to add to git tag?',
+    initial: tagName
+  });
+  return annotationMessage;
+};
 const confirmPushCommit = async buildMessage => {
   const {
     confirm
@@ -425,19 +457,19 @@ const commitAndPushNewBuild = async config => {
   await createNewBuildCommit(config);
   await pushToGitRemote();
 };
-const confirmPushTag = async tagName => {
+const confirmPushTag = async (tagName, annotationMessage) => {
   const {
     confirm
   } = await prompt([{
     type: 'confirm',
     name: 'confirm',
-    message: `${_ansiColors.default.bold.red('[Warning]')} Push new tag ${_ansiColors.default.bold.yellow(tagName)} to git remote?`
+    message: `${_ansiColors.default.bold.red('[Warning]')} Push new tag ${_ansiColors.default.bold.yellow(tagName)} with annotation message "${_ansiColors.default.bold.yellow(annotationMessage)}" to git remote?`
   }]);
   return confirm;
 };
-const createGitTag = async tagName => {
+const createGitTag = async (tagName, annotationMessage) => {
   try {
-    await (0, _zx.$)`git tag ${tagName}`;
+    await (0, _zx.$)`git tag -a ${tagName} -m "${annotationMessage}"`;
   } catch (err) {
     console.log(err.stderr || err);
     process.exit(1);
@@ -453,11 +485,12 @@ const pushGitTag = async tagName => {
 };
 const createAndPushGitTag = async ({
   tagName,
+  annotationMessage,
   noConfirm
 }) => {
-  const confirmAnswer = noConfirm || (await confirmPushTag(tagName));
+  const confirmAnswer = noConfirm || (await confirmPushTag(tagName, annotationMessage));
   if (confirmAnswer) {
-    await createGitTag(tagName);
+    await createGitTag(tagName, annotationMessage);
     await pushGitTag(tagName);
   }
 };
@@ -497,9 +530,11 @@ const displayReleaseInfo = config => {
     packagePath,
     buildMessage,
     tagName,
+    annotationMessage,
     publishable,
     npmjsTag,
-    isBetaRelease
+    isBetaRelease,
+    noGitTag
   } = config;
   console.log(`
 
@@ -509,8 +544,9 @@ ${_ansiColors.default.blue('Version:')} ${version}
 ${_ansiColors.default.blue('Root directory:')} ${repositoryRoot}
 ${_ansiColors.default.blue('Package name:')} ${packageName}
 ${_ansiColors.default.blue('package.json path:')} ${_path.default.join(packagePath, 'package.json')}${buildMessage ? `
-${_ansiColors.default.blue('Commit message:')} ${buildMessage}` : ''}${isBetaRelease ? '' : `
-${_ansiColors.default.blue('Git tag:')} ${tagName}`}${publishable ? `
+${_ansiColors.default.blue('Commit message:')} ${buildMessage}` : ''}${isBetaRelease || noGitTag ? '' : `
+${_ansiColors.default.blue('Git tag:')} ${tagName}`}${isBetaRelease || noGitTag ? '' : `
+${_ansiColors.default.blue('Git tag annotation:')} ${annotationMessage}`}${publishable ? `
 ${_ansiColors.default.blue('Npmjs tag:')} ${npmjsTag}` : ''}
 ${_ansiColors.default.bold.green('=============================================')}
 `);
@@ -551,6 +587,11 @@ const optionList = [{
   type: String,
   alias: 't',
   description: 'tag suffix to be appended to the version when pushing to git'
+}, {
+  name: 'annotation-message',
+  type: String,
+  alias: 'm',
+  description: 'annotation message that will annotate the git tag'
 }, {
   name: 'branch-filter',
   type: String,
@@ -560,6 +601,10 @@ const optionList = [{
   name: 'no-commit',
   type: Boolean,
   description: 'do not create a new commit on git (in case the goal is just tagging it)'
+}, {
+  name: 'no-git-tag',
+  type: Boolean,
+  description: 'do not create a new tag on git'
 }, {
   name: 'no-confirm',
   type: Boolean,
@@ -589,6 +634,7 @@ validateArgs(args);
 const config = {};
 config.noConfirm = !!args['no-confirm'];
 config.noCommit = !!args['no-commit'];
+config.noGitTag = !!args['no-git-tag'];
 config.repositoryRoot = await getGitRootDirectory();
 config.branch = args.branch || (await getBranch({
   branchFilter: args['branch-filter']
@@ -601,10 +647,12 @@ config.version = args.version || (await getVersion(config));
 config.packageName = await getPackageName(config);
 config.buildMessage = config.noCommit ? '' : getBuildMessage(config);
 config.isBetaRelease = config.version.includes('-beta.');
-if (!config.isBetaRelease) {
+if (!config.isBetaRelease && !config.noGitTag) {
   const tagSuffix = args['tag-suffix'] ?? (await getGitTagSuffix());
   const tagPrefix = config.isPackageInRepositoryRoot ? '' : `${config.packageName}/`;
   config.tagName = `${tagPrefix}v${config.version}${tagSuffix}`;
+  const annotationMessage = args['annotation-message'] ?? (await getGitAnnotationMessage(config));
+  config.annotationMessage = annotationMessage;
 }
 config.publishable = !!args.publishable;
 if (config.publishable) {
@@ -624,7 +672,7 @@ if (!config.noConfirm) {
 if (!config.noCommit) {
   await commitAndPushNewBuild(config);
 }
-if (!config.isBetaRelease) {
+if (!config.isBetaRelease && !config.noGitTag) {
   await createAndPushGitTag(config);
 }
 if (config.publishable) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.33.1",
+  "version": "2.33.2-bruno.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/tag-release.mjs

@@ -215,28 +215,58 @@ The tag-release script must run from a npm project.
 }
 
 const getNextVersions = ( currentVersion ) => {
-  const [ major, minor, patch, beta ] = currentVersion.split( /\.|-beta\./ ).map( Number )
+  const regex = /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-(\w+)\.(\d+))?$/i
+  const [ , dirtyMajor, dirtyMinor, dirtyPatch, testTag, dirtyTestVersion ] = currentVersion.match( regex )
+  const major = parseInt( dirtyMajor )
+  const minor = parseInt( dirtyMinor ) || 0
+  const patch = parseInt( dirtyPatch ) || 0
+  const testVersion = parseInt( dirtyTestVersion ) || 0
 
   const nextMajor = `${major + 1}.0.0`
   const nextMinor = `${major}.${minor + 1}.0`
   const nextPatch = `${major}.${minor}.${patch + 1}`
-  const nextBeta = beta ? `${major}.${minor}.${patch}-beta.${beta + 1}` : `${major}.${minor}.${patch + 1}-beta.1`
+
+  const nextAlpha = testTag === 'alpha' ?
+    `${major}.${minor}.${patch}-alpha.${testVersion + 1}` :
+    `${major}.${minor}.${patch + 1}-alpha.1`
+
+  const nextBeta = testTag === 'beta' ?
+    `${major}.${minor}.${patch}-beta.${testVersion + 1}` :
+    `${major}.${minor}.${patch + 1}-beta.1`
+
+  const nextTestTag = testTag && ![ 'alpha', 'beta' ].includes( testTag ) ?
+    `${major}.${minor}.${patch}-${testTag}.${testVersion + 1}` :
+    null
 
   return {
     nextMajor,
     nextMinor,
     nextPatch,
+    nextAlpha,
     nextBeta,
+    nextTestTag,
+    testTag,
   }
 }
 
 const promptForVersion = async ( currentVersion ) => {
-  const { nextMajor, nextMinor, nextPatch, nextBeta } = getNextVersions( currentVersion )
+  const {
+    nextMajor,
+    nextMinor,
+    nextPatch,
+    nextAlpha,
+    nextBeta,
+    nextTestTag,
+    testTag
+  } = getNextVersions( currentVersion )
+
   const choices = [
     { hint : '(major release)', value : nextMajor },
     { hint : '(minor release)', value : nextMinor },
     { hint : '(patch release)', value : nextPatch },
+    { hint : '(alpha release)', value : nextAlpha },
     { hint : '(beta release)', value : nextBeta },
+    ...( nextTestTag ? [ { hint : `(${testTag} release)`, value : nextTestTag } ] : [] ),
     { hint : '(current version)', value : currentVersion },
     { value : 'custom' },
   ]
@@ -288,6 +318,16 @@ const getGitTagSuffix = async () => {
   return tagSuffix
 }
 
+const getGitAnnotationMessage = async ( { tagName } ) => {
+  const { annotationMessage } = await prompt( {
+    type : 'input',
+    name : 'annotationMessage',
+    message : 'What annotation message would you like to add to git tag?',
+    initial : tagName
+  } )
+  return annotationMessage
+}
+
 const confirmPushCommit = async ( buildMessage ) => {
   const { confirm } = await prompt( [ {
     type : 'confirm',
@@ -406,18 +446,18 @@ const commitAndPushNewBuild = async ( config ) => {
   await pushToGitRemote()
 }
 
-const confirmPushTag = async ( tagName ) => {
+const confirmPushTag = async ( tagName, annotationMessage ) => {
   const { confirm } = await prompt( [ {
     type : 'confirm',
     name : 'confirm',
-    message : `${colors.bold.red( '[Warning]' )} Push new tag ${colors.bold.yellow( tagName )} to git remote?`
+    message : `${colors.bold.red( '[Warning]' )} Push new tag ${colors.bold.yellow( tagName )} with annotation message "${colors.bold.yellow( annotationMessage )}" to git remote?`
   } ] )
   return confirm
 }
 
-const createGitTag = async ( tagName ) => {
+const createGitTag = async ( tagName, annotationMessage ) => {
   try {
-    await $`git tag ${tagName}`
+    await $`git tag -a ${tagName} -m "${annotationMessage}"`
   } catch ( err ) {
     console.log( err.stderr || err )
     process.exit( 1 )
@@ -433,10 +473,10 @@ const pushGitTag = async ( tagName ) => {
   }
 }
 
-const createAndPushGitTag = async ( { tagName, noConfirm } ) => {
-  const confirmAnswer = noConfirm || await confirmPushTag( tagName )
+const createAndPushGitTag = async ( { tagName, annotationMessage, noConfirm } ) => {
+  const confirmAnswer = noConfirm || await confirmPushTag( tagName, annotationMessage )
   if ( confirmAnswer ) {
-    await createGitTag( tagName )
+    await createGitTag( tagName, annotationMessage )
     await pushGitTag( tagName )
   }
 }
@@ -474,9 +514,11 @@ const displayReleaseInfo = ( config ) => {
     packagePath,
     buildMessage,
     tagName,
+    annotationMessage,
     publishable,
     npmjsTag,
-    isBetaRelease
+    isBetaRelease,
+    noGitTag,
   } = config
 
   console.log( `
@@ -487,8 +529,9 @@ ${colors.blue( 'Version:' )} ${version}
 ${colors.blue( 'Root directory:' )} ${repositoryRoot}
 ${colors.blue( 'Package name:' )} ${packageName}
 ${colors.blue( 'package.json path:' )} ${path.join( packagePath, 'package.json' )}${buildMessage ? `
-${colors.blue( 'Commit message:' )} ${buildMessage}` : ''}${isBetaRelease ? '' : `
-${colors.blue( 'Git tag:' )} ${tagName}`}${publishable ? `
+${colors.blue( 'Commit message:' )} ${buildMessage}` : ''}${isBetaRelease || noGitTag ? '' : `
+${colors.blue( 'Git tag:' )} ${tagName}`}${isBetaRelease || noGitTag ? '' : `
+${colors.blue( 'Git tag annotation:' )} ${annotationMessage}`}${publishable ? `
 ${colors.blue( 'Npmjs tag:' )} ${npmjsTag}` : ''}
 ${colors.bold.green( '=============================================' )}
 ` )
@@ -536,6 +579,12 @@ const optionList = [
     alias : 't',
     description : 'tag suffix to be appended to the version when pushing to git',
   },
+  {
+    name : 'annotation-message',
+    type : String,
+    alias : 'm',
+    description : 'annotation message that will annotate the git tag',
+  },
   { 
     name : 'branch-filter',
     type : String,
@@ -547,6 +596,11 @@ const optionList = [
     type : Boolean,
     description : 'do not create a new commit on git (in case the goal is just tagging it)',
   },
+  {
+    name : 'no-git-tag',
+    type : Boolean,
+    description : 'do not create a new tag on git',
+  },
   { 
     name : 'no-confirm',
     type : Boolean,
@@ -586,6 +640,8 @@ config.noConfirm = !!args['no-confirm']
 
 config.noCommit = !!args['no-commit']
 
+config.noGitTag = !!args['no-git-tag']
+
 config.repositoryRoot = await getGitRootDirectory()
 
 config.branch = args.branch || await getBranch( { branchFilter : args['branch-filter'] } )
@@ -605,10 +661,13 @@ config.buildMessage = config.noCommit ? '' : getBuildMessage( config )
 
 config.isBetaRelease = config.version.includes( '-beta.' )
 
-if ( !config.isBetaRelease ) {
+if ( !config.isBetaRelease && !config.noGitTag ) {
   const tagSuffix = args['tag-suffix'] ?? await getGitTagSuffix()
   const tagPrefix = config.isPackageInRepositoryRoot ? '' : `${config.packageName}/`
   config.tagName = `${tagPrefix}v${config.version}${tagSuffix}`
+
+  const annotationMessage = args['annotation-message'] ?? await getGitAnnotationMessage( config )
+  config.annotationMessage = annotationMessage
 }
 
 config.publishable = !!args.publishable
@@ -627,7 +686,7 @@ if ( !config.noConfirm ) {
 }
 
 if ( !config.noCommit ) { await commitAndPushNewBuild( config ) }
-if ( !config.isBetaRelease ) { await createAndPushGitTag( config ) }
+if ( !config.isBetaRelease && !config.noGitTag ) { await createAndPushGitTag( config ) }
 if ( config.publishable ) { await publishToNpmjs( config ) }
 
 process.exit()