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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/merge/cli-merge-all.js +1 -1
  3. package/src/merge/cli-merge.js +3 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@docupace/pipeline",
3
- "version": "1.0.81-alpha.1",
3
+ "version": "1.0.81-alpha.3",
4
4
  "main": "index.js",
5
5
  "type": "module",
6
6
  "bin": {
package/src/merge/cli-merge-all.js CHANGED
@@ -429,7 +429,7 @@ async function mergeAll(verbose = false) {
429
429
  );
430
430
 
431
431
  if (i < config.mergeBranches - 1) {
432
- await new Promise((res) => setTimeout(res, 1000));
432
+ await new Promise((res) => setTimeout(res, 90000));
433
433
  }
434
434
 
435
435
  if (!branchResult.success) {
package/src/merge/cli-merge.js CHANGED
@@ -229,13 +229,14 @@ function mergeIntoTarget(
229
229
 
230
230
  // Delete remote merge branch
231
231
  try {
232
+ console.log('About to delete remote branch');
232
233
  execSync(`git push origin --delete ${mergeBranchName}`, {
233
234
  stdio: 'pipe',
234
235
  });
235
236
  if (verbose)
236
237
  console.log(`🗑️ Deleted remote merge branch: ${mergeBranchName}`);
237
- } catch {
238
- // Remote branch doesn't exist, which is fine
238
+ } catch (e) {
239
+ console.error('Failed to delete remote branch', e);
239
240
  }
240
241
 
241
242
  if (verbose) console.log(`✅ Successfully merged into ${targetBranch}`);