@docupace/pipeline 1.0.70 → 1.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/merge/cli-merge-all.js

@@ -222,6 +222,9 @@ async function runPreparePhase(
       case 3:
         console.log(`⚠️ ${configName}: Build failed`);
         break;
+      case 4:
+        console.log(`✅ ${configName}: No Changes`);
+        break;
       default:
         console.log(
           `❌ ${configName}: Unknown error (exit code: ${result.exitCode})`,
@@ -239,7 +242,9 @@ async function runFollowUpPhase(prepareResults, verbose = false) {
   console.log(`\n🔄 Phase 2: Running follow-up based on prepare phase results`);
 
   // Check if all repositories passed
-  const allPassed = prepareResults.every((r) => r.exitCode === 0);
+  const allPassed = prepareResults.every(
+    (r) => r.exitCode === 0 || r.exitCode === 4,
+  );
 
   for (let i = 0; i < prepareResults.length; i++) {
     const result = prepareResults[i];
@@ -281,24 +286,26 @@ async function runFollowUpPhase(prepareResults, verbose = false) {
 
     console.log(`  Action: ${action}`);
 
-    const followUpResult = runMergeCommand(
-      result.repoPath,
-      result.fromBranch,
-      result.toBranch,
-      result.buildScript,
-      flags,
-      verbose,
-    );
+    if (result.exitCode !== 4) {
+      const followUpResult = runMergeCommand(
+        result.repoPath,
+        result.fromBranch,
+        result.toBranch,
+        result.buildScript,
+        flags,
+        verbose,
+      );
 
-    // Update the result with follow-up information
-    result.followUpExitCode = followUpResult.exitCode;
-    result.followUpError = followUpResult.error;
-    result.followUpAction = action;
+      // Update the result with follow-up information
+      result.followUpExitCode = followUpResult.exitCode;
+      result.followUpError = followUpResult.error;
+      result.followUpAction = action;
 
-    if (followUpResult.exitCode === 0) {
-      console.log(`✅ ${result.configName}: ${action} completed`);
-    } else {
-      console.log(`❌ ${result.configName}: ${action} failed`);
+      if (followUpResult.exitCode === 0) {
+        console.log(`✅ ${result.configName}: ${action} completed`);
+      } else {
+        console.log(`❌ ${result.configName}: ${action} failed`);
+      }
     }
   }
 
@@ -328,7 +335,9 @@ async function processMergeBranch(
   const finalResults = await runFollowUpPhase(prepareResults, verbose);
 
   // Summary
-  const allPassed = prepareResults.every((r) => r.exitCode === 0);
+  const allPassed = prepareResults.every(
+    (r) => r.exitCode === 0 || r.exitCode === 4,
+  );
   const mergeFailures = prepareResults.filter((r) => r.exitCode === 2);
   const buildFailures = prepareResults.filter((r) => r.exitCode === 3);
   const successes = prepareResults.filter((r) => r.exitCode === 0);

package/src/merge/cli-merge.js

@@ -327,7 +327,7 @@ export function setupMerge(program) {
             console.log('✅ No changes to merge');
             execSync(`git checkout ${targetBranch}`, { stdio: 'pipe' });
             execSync(`git branch -d ${mergeBranchName}`, { stdio: 'pipe' });
-            return;
+            process.exit(4);
           }
 
           // 4. If conflicts, try auto-resolve