Version bump for amazon-chime-sdk-js@1.1.0

ltrung · ltrung · commit 1a6b3de08a71 · 2021-12-29T14:30:50.000-08:00
diff --git a/.base-branch b/.base-branch
@@ -0,0 +1 @@
+origin/main
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2021-12-29
+    
+### Added
+    
+### Removed
+    
+### Changed
+    
+### Fixed
+    
 ## [1.0.0] - 2021-12-17
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "release-test",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Testing release",
   "main": "CHANGELOG.md",
   "files": [
diff --git a/script/cli-utils.js b/script/cli-utils.js
@@ -10,6 +10,7 @@ const output = require('process').stdout;
 const util = require('util');
 const readline = require('readline');
 
+const YES = 'yes';
 
 const logger = {
   error: (output, info = '') => console.error('\x1b[31m%s\x1b[0m', output, info), // Red
@@ -46,24 +47,24 @@ const prompt = async (prompt) => {
       resolve(answer) 
     });
   });
-}
+};
 
-const shouldContinuePrompt = async (prompt) => {
+const shouldContinuePrompt = async () => {
   const cont = await new Promise((resolve) => {
     rl = readline.createInterface({ input , output });
-    rl.question(prompt, (answer) => {
+    rl.question(`Type '${util.format('\x1b[32m%s\x1b[0m', YES)}' to continue\n`, (answer) => {
       rl.close();
-      resolve(answer.trim().toLowerCase() === 'yes');
+      resolve(answer.trim().toLowerCase() === YES);
     });
   });
   if (!cont) {
     quit(0);
   }
-}
+};
 
 const quit = (statusCode) => {
   process.exit(statusCode);
-}
+};
 
 module.exports = {
   logger,
diff --git a/script/release.js b/script/release.js
@@ -10,31 +10,53 @@ const deployDemo = (version) => {
   // spawnOrFail('npm', [`run deploy -- -b ${demo_name} -s ${demo_name} -o ${demo_name} -u false`], { printErr: true });
 };
 
+const getCurrentRemoteBranch = () => {
+  return (spawnOrFail('git', ['for-each-ref --format="%(upstream:short)" "$(git symbolic-ref -q HEAD)"'], { skipOutput: true })).trim();
+};
+
+const buildAndPack = () => {
+  logger.log('Building package...');
+  spawnOrFail('npm', ['run build:release']);
+  logger.log('Packaging ...');
+  spawnOrFail('npm', ['pack --dry-run'], { printErr: true });
+};
+
+const cleanUp = async (remoteBranch) => {
+  logger.warn(`Warning: Resetting HEAD ${remoteBranch ? `to ${remoteBranch}` : ''}.\nAll current staged and local changes will be lost.`);
+  await shouldContinuePrompt();
+  spawnOrFail('git', [`reset --hard ${remoteBranch ? remoteBranch : ''}`]);
+  spawnOrFail('git', [' clean -ffxd .']);
+};
+
 const release = async () => {
   spawnOrFail('git', ['fetch origin'], { skipOutput: true });
   const currentBranch = (spawnOrFail('git', [' branch --show-current'], { skipOutput: true })).trim();
-  const remoteBranch = (spawnOrFail('git', ['for-each-ref --format="%(upstream:short)" "$(git symbolic-ref -q HEAD)"'], { skipOutput: true })).trim();
+  const remoteBranch = getCurrentRemoteBranch();
   if (!remoteBranch || (remoteBranch !== 'origin/main' && (/^origin\/release-[0-9]+\.x$/).test(remoteBranch))) {
     logger.error(`The local branch ${currentBranch} does not track either main or release-<version>.x branch`);
     quit(1);
   }
-  logger.warn(`Warning: Resetting HEAD to ${remoteBranch}.\nAll current staged and local changes will be lost.`);
-  await shouldContinuePrompt('Do you wish to continue\n');
-  // spawnOrFail('git', [`reset --hard ${remoteBranch}`]);
-  // spawnOrFail('git', [' clean -ffxd .']);
+  await cleanUp(remoteBranch);
 
-  logger.log('Building package...');
-  spawnOrFail('npm', ['run build:release']);
-  logger.log('Packaging ...');
-  spawnOrFail('npm', ['pack --dry-run'], { printErr: true });
-  logger.log('Do you want to upload these files to release branch');
-  await shouldContinuePrompt('Type \'yes\' to continue\n');
+  buildAndPack();
+  logger.log('Do you want to upload these files to release branch?\n');
+  await shouldContinuePrompt();
   spawnOrFail('git', ['push origin HEAD:release -f']);
   deployDemo(currentVersion);
 
   //Bump next development version
-  versionBump();
-}
+  await versionBump();
+};
+
+const hotfix = async () => {
+  await cleanUp();
+
+  buildAndPack();
+
+  await versionBump(1, 'hotfix');
+
+  deployDemo(currentVersion);
+};
 
 const main = async () => {
   logger.log('Choose one of the following options:');
@@ -47,32 +69,24 @@ const main = async () => {
     case '1':
       release();
       break;
+    case '2':
+      hotfix();
+      break;
+    case '3':
+      const remoteBranch = getCurrentRemoteBranch();
+      if (!remoteBranch || (remoteBranch !== 'origin/release' && (remoteBranch !== 'origin/hotfix'))) {
+        logger.error(`The local branch ${currentBranch} does not track either release or hotfix branch`);
+        quit(1);
+      }
+      cleanUp(remoteBranch);
+      deployDemo(currentVersion);
+      break;
     default: 
       if (option) {
         logger.error('Invalid option');
       }
       quit(1);
   }
-  // logger.log(`Resetting HEAD to origin/${currentBranch}`);
-  // // spawnOrFail('git', [`reset --hard origin/${currentBranch}`]);
-  // // spawnOrFail('git', [' clean -ffxd .']);
-
-  // logger.log('Building package...');
-  // spawnOrFail('npm', ['run build:release']);
-  // logger.log('Packaging ...');
-  // spawnOrFail('npm', ['pack --dry-run'], { printErr: true });
-
-  // logger.log('Do you want to upload these files');
-  // let cont = await shouldContinuePrompt('Type \'yes\' to continue\n');
-  // if (!cont) {
-  //   quit(0);
-  // }
-  // if (option === '1') { //Release
-  //   spawnOrFail('git', ['push origin HEAD:release -f']);
-  //   deployDemo(currentVersion);
-  // } else if (option === '2') { //Hotfix
-  //   spawnOrFail('git', ['push origin HEAD:hotfix -f']);
-  // }
-}
+};
 
 main();
diff --git a/script/version-util.js b/script/version-util.js
@@ -4,41 +4,46 @@ const { logger, spawnOrFail, prompt, shouldContinuePrompt, quit, fs, process, pa
 // process.chdir(path.join(__dirname, '..'));
 const currentVersion = require('../package.json').version;
 
+const isPreRelease = (version) => {
+  return version.split('.')[3] >0;
+};
+
 const getNewVersion = (currentVersion, versionIncrement) => {
-  const ver_arr = currentVersion.split('.');
+  const verArr = currentVersion.split('.');
+  const isBeta = isPreRelease(currentVersion);
   switch (versionIncrement) {
     case 1: //Patch
-      if (ver_arr[3]) {
+      if (isBeta) {
         logger.error(`ERROR: Cannot increase patch in pre-release version `);
         return undefined;
       }  
-      ver_arr[2] = Number(ver_arr[2]) + 1;
-      return ver_arr.join('.');
+      verArr[2] = Number(verArr[2]) + 1;
+      return verArr.join('.');
     case 2: // Minor
-      if (ver_arr[3]) {
+      if (isBeta) {
         logger.error(`ERROR: Cannot increase patch in pre-release version `);
         return undefined;
       }  
-      ver_arr[1] = Number(ver_arr[1]) + 1;
-      return ver_arr.join('.');
+      verArr[1] = Number(verArr[1]) + 1;
+      return verArr.join('.');
     case 3: //Major
-      if (ver_arr[3]) {
+      if (isBeta) {
         return currentVersion.split('-')[0];
       }  
-      ver_arr[0] = Number(ver_arr[0]) + 1;
-      return ver_arr.join('.');
+      verArr[0] = Number(verArr[0]) + 1;
+      return verArr.join('.');
     case 4: // Beta
-      if (ver_arr[3]) { //Existing beta
-        ver_arr[3] = Number(ver_arr[3]) + 1;
-        return ver_arr.join('.');
+      if (isBeta) { //Existing beta
+        verArr[3] = Number(verArr[3]) + 1;
+        return verArr.join('.');
       }
-      ver_arr[0] = Number(ver_arr[0]) + 1;
-      return ver_arr.join('.') + '-beta.0';
+      verArr[0] = Number(verArr[0]) + 1;
+      return verArr.join('.') + '-beta.0';
     default:
       logger.error(`ERROR: Invalid input: ${versionIncrement}`); 
       return undefined;
   }
-}
+};
 
 const updateChangelog = (newVersion) => {
   logger.log(`Updating CHANGELOG.md with a new release entry - ${newVersion}`);
@@ -53,35 +58,69 @@ const updateChangelog = (newVersion) => {
     \n`;
   changeLog = changeLog.substring(0, latestEntryIndex) + newEntry + changeLog.substring(latestEntryIndex);
   fs.writeFileSync(filePath, changeLog);
+};
+
+const updateBaseBranch = (branchName) => {
+  logger.log(`Updating the base branch in .base-branch to ${branchName}`);
+  const filePath = path.resolve(__dirname, '../.base-branch');
+  fs.writeFileSync(filePath, `origin/${branchName}`);
 }
 
-const versionBump = async () => {
-  logger.log('Choose one of the following options to bump the next version:');
-  logger.log('  1. Patch');
-  logger.log('  2. Minor');
-  logger.log('  3. Major');
-  logger.log('  4. Beta');
-  const option = await prompt('');
-  const newVersion = getNewVersion(currentVersion, Number(option));
+const versionBump = async (option, branchName) => {
+  if (!option) {
+    logger.log('Choose one of the following options to bump the next version:');
+    logger.log('  1. Patch');
+    logger.log('  2. Minor');
+    logger.log('  3. Major');
+    logger.log('  4. Beta');
+    option = Number(await prompt(''));
+  }
+  const newVersion = getNewVersion(currentVersion, option);
   if (!newVersion) {
     quit(1);
   }
+
+  branchName = branchName ? branchName : 'version-bump';
+
+  const prevReleaseBranch = !isPreRelease(currentVersion) && (option === 3 || option === 4) 
+    ? `release-${currentVersion.split('.')[0]}.x`
+    : '';
+
   logger.warn('Warning: you are bumping the version\n');
   logger.warn(`  From: ${currentVersion}\n`);
   logger.warn(`  To: ${newVersion}\n`);
-  await shouldContinuePrompt('Type \'yes\' to continue\n');
+  if (prevReleaseBranch) {
+    logger.warn(`  This will also create ${prevReleaseBranch} branch.`);
+  }
+  await shouldContinuePrompt();
+
+  if (prevReleaseBranch) {
+    const currentBranch = (spawnOrFail('git', [' branch --show-current'], { skipOutput: true })).trim();
+    spawnOrFail('git', [`checkout -b ${prevReleaseBranch}`]);
+    updateBaseBranch(prevReleaseBranch);
+    spawnOrFail('git', ['add -A']);
+    spawnOrFail('git', [`commit -m "Update base branch to ${prevReleaseBranch}"`]);
+    spawnOrFail('git', [`push origin HEAD:${prevReleaseBranch} -f`]);
+    logger.log(`Branch ${prevReleaseBranch} is created. Please make sure to set branch protection.`);
+
+    //Switch back to the local branch
+    spawnOrFail('git', [`checkout ${currentBranch}`]);
+  }
+
   spawnOrFail('npm', [`version ${newVersion} --no-git-tag-version`]);
   updateChangelog(newVersion);
 
   logger.log('Committing version bump...');
   spawnOrFail('git', ['add -A']);
   spawnOrFail('git', [`commit -m "Version bump for amazon-chime-sdk-js@${newVersion}"`]);
-  logger.log('Do you want to upload these files to version-bump branch');
-  await shouldContinuePrompt('Type \'yes\' to continue\n');
-  spawnOrFail('git', ['push origin HEAD:version-bump -f']);
-}
+  logger.log(`Do you want to upload these files to ${branchName} branch?\n`);
+  await shouldContinuePrompt();
+  spawnOrFail('git', [`push origin HEAD:${branchName} -f`]);
+  logger.log('Please create a pull request to merge the version bump to main.');
+};
 
 module.exports = {
   versionBump,
   currentVersion,
-}
+  updateBaseBranch
+};

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "release-test",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"description": "Testing release",`
`5`	`5`	`"main": "CHANGELOG.md",`
`6`	`6`	`"files": [`