@panoptic-it-solutions/coolify-setup 1.1.41 → 1.1.42
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.
- package/dist/templates/workflow.js +9 -19
- package/package.json +1 -1
|
@@ -309,27 +309,17 @@ ${migrationCheck}
|
|
|
309
309
|
});
|
|
310
310
|
console.log(\`Created sync PR #\${pr.number}\`);
|
|
311
311
|
|
|
312
|
-
//
|
|
312
|
+
// Merge immediately (just a version bump, no review needed)
|
|
313
313
|
try {
|
|
314
|
-
await github.
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
}) {
|
|
320
|
-
pullRequest {
|
|
321
|
-
autoMergeRequest {
|
|
322
|
-
enabledAt
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
}
|
|
326
|
-
}
|
|
327
|
-
\`, {
|
|
328
|
-
pullRequestId: pr.node_id
|
|
314
|
+
await github.rest.pulls.merge({
|
|
315
|
+
owner: context.repo.owner,
|
|
316
|
+
repo: context.repo.repo,
|
|
317
|
+
pull_number: pr.number,
|
|
318
|
+
merge_method: 'merge'
|
|
329
319
|
});
|
|
330
|
-
console.log(\`
|
|
331
|
-
} catch (
|
|
332
|
-
console.log(\`Auto-merge
|
|
320
|
+
console.log(\`Merged sync PR #\${pr.number}\`);
|
|
321
|
+
} catch (mergeError) {
|
|
322
|
+
console.log(\`Auto-merge failed (may need manual merge): \${mergeError.message}\`);
|
|
333
323
|
}
|
|
334
324
|
} catch (error) {
|
|
335
325
|
console.log(\`Sync PR creation skipped: \${error.message}\`);
|