@docupace/pipeline 1.0.81-alpha.3 → 1.0.81-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.81-alpha.3",
+  "version": "1.0.81-alpha.5",
   "main": "index.js",
   "type": "module",
   "bin": {

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

@@ -226,6 +226,10 @@ async function runPreparePhase(
       case 4:
         console.log(`✅ ${configName}: No Changes`);
         break;
+      case 5:
+        console.log(`❌ Stopping Merge`);
+        process.exit(1);
+        break;
       default:
         console.log(
           `❌ ${configName}: Unknown error (exit code: ${result.exitCode})`,
@@ -382,7 +386,7 @@ async function mergeAll(verbose = false) {
       config.repositories,
     );
 
-    if (existingPRs.length > 0) {
+    /*if (existingPRs.length > 0) {
       console.log(
         `❌ Found ${existingPRs.length} existing pull request(s) with "Automated merge with changeset" description. Exiting to prevent conflicts.`,
       );
@@ -394,7 +398,7 @@ async function mergeAll(verbose = false) {
         });
       }
       process.exit(1);
-    }
+    }*/
 
     if (verbose)
       console.log('✅ No existing automated merge PRs found. Proceeding...');
@@ -428,7 +432,12 @@ async function mergeAll(verbose = false) {
         verbose,
       );
 
-      if (i < config.mergeBranches - 1) {
+      if (
+        branchResult.success &&
+        branchResult.summary.successes > 0 &&
+        i < config.mergeBranches.length - 1
+      ) {
+        console.log('Pausing before next merge');
         await new Promise((res) => setTimeout(res, 90000));
       }
 

package/src/merge/cli-merge.js

@@ -66,6 +66,17 @@ function attemptMerge(sourceBranch, targetBranch, verbose = false) {
     console.log(`🔀 Merging ${sourceBranch} into current branch`);
   }
 
+  // Fetch and pull the source branch
+  try {
+    execSync(`git fetch origin ${sourceBranch}`, {
+      stdio: verbose ? 'inherit' : 'pipe',
+    });
+    if (verbose) console.log(`📥 Fetched source branch: ${sourceBranch}`);
+  } catch (error) {
+    if (verbose)
+      console.log(`⚠️  Failed to fetch ${sourceBranch}: ${error.message}`);
+  }
+
   try {
     execSync(`git merge --no-commit --no-ff origin/${sourceBranch}`, {
       stdio: 'pipe',
@@ -229,7 +240,6 @@ function mergeIntoTarget(
 
     // Delete remote merge branch
     try {
-      console.log('About to delete remote branch');
       execSync(`git push origin --delete ${mergeBranchName}`, {
         stdio: 'pipe',
       });
@@ -318,9 +328,10 @@ function checkForUncommittedChangesets(sourceBranch, verbose = false) {
       ).trim();
 
       if (changesetFiles) {
-        throw new Error(
-          `Cannot merge a branch where version has not been bumped. Found changesets in ${sourceBranch}`,
+        console.log(
+          `❌ Cannot merge a branch where version has not been bumped. Found changesets in ${sourceBranch}`,
         );
+        process.exit(5);
       }
     } catch (error) {
       if (error.message.includes('Cannot merge')) {