@hed-hog/cli 0.0.111 → 0.0.112

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hed-hog/cli",
-    "version": "0.0.111",
+    "version": "0.0.112",
     "description": "HedHog CLI tool",
     "author": "HedHog",
     "private": false,

package/dist/src/templates/deployment/scripts.promote-production.js.ejs

@@ -239,6 +239,7 @@ function promote() {
   }
 
   printStep('Merging master → production');
+  const headBefore = runGit(['rev-parse', 'HEAD']).stdout;
   const mergeArgs = appsArg
     ? ['merge', '--no-ff', '-m', `chore: deploy to production [deploy:${appsArg}]`, 'master']
     : ['merge', '--no-ff', '--no-edit', 'master'];
@@ -251,7 +252,20 @@ function promote() {
       '     Resolve conflicts manually and retry.',
     );
   }
-  printDone();
+
+  const headAfter = runGit(['rev-parse', 'HEAD']).stdout;
+  const alreadyUpToDate = headBefore === headAfter;
+
+  if (alreadyUpToDate) {
+    printDone('already up to date');
+    printInfo('No new commits from master — creating redeploy commit to trigger CI');
+    const redeployMsg = appsArg
+      ? `chore: redeploy [deploy:${appsArg}]`
+      : 'chore: redeploy all apps';
+    runGit(['commit', '--allow-empty', '-m', redeployMsg]);
+  } else {
+    printDone();
+  }
 
   printStep('Pushing production to origin');
   if (productionCreatedNow || !productionRemoteExists) {