@docupace/pipeline 1.0.81-alpha.0 → 1.0.81-alpha.2

package/package.json

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

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

@@ -429,7 +429,7 @@ async function mergeAll(verbose = false) {
       );
 
       if (i < config.mergeBranches - 1) {
-        await new Promise((res) => setTimeout(res, 1000));
+        await new Promise((res) => setTimeout(res, 90000));
       }
 
       if (!branchResult.success) {

package/src/merge/cli-merge.js

@@ -306,10 +306,10 @@ function checkForUncommittedChangesets(sourceBranch, verbose = false) {
       stdio: 'pipe',
     });
 
-    // Check for .md files in .changeset directory
+    // Check for .md files in .changeset directory (excluding README.md)
     try {
       const changesetFiles = execSync(
-        'find .changeset -name "*.md" 2>/dev/null | head -1',
+        'find .changeset -name "*.md" -not -name "README.md" 2>/dev/null | head -1',
         {
           encoding: 'utf8',
           stdio: 'pipe',
@@ -318,7 +318,7 @@ function checkForUncommittedChangesets(sourceBranch, verbose = false) {
 
       if (changesetFiles) {
         throw new Error(
-          `Cannot merge a branch where version has not been bumped. Found uncommitted changesets in ${sourceBranch}`,
+          `Cannot merge a branch where version has not been bumped. Found changesets in ${sourceBranch}`,
         );
       }
     } catch (error) {