@panoptic-it-solutions/coolify-setup 1.1.28 → 1.1.30

package/dist/git.js

@@ -256,8 +256,18 @@ export async function setupGitHub(projectName) {
             }
             catch {
                 // Checkout failed - might be worktree issue
-                // Try to push current branch to develop instead
+                // Try to push current branch to develop instead (if fast-forward possible)
                 try {
+                    // First fetch to check if develop exists remotely
+                    try {
+                        run('git fetch origin develop');
+                        // Check if current branch contains all develop commits (fast-forward possible)
+                        run(`git merge-base --is-ancestor origin/develop ${currentBranch}`);
+                    }
+                    catch {
+                        // Either develop doesn't exist remotely, or can't fast-forward
+                        // Try push anyway - will fail if develop exists and diverged
+                    }
                     run(`git push origin ${currentBranch}:develop -u`);
                     result.developBranchCreated = true;
                     result.repoPushed = true;
@@ -265,7 +275,7 @@ export async function setupGitHub(projectName) {
                     checkoutSucceeded = false;
                 }
                 catch {
-                    result.warnings.push('Failed to push develop branch (checkout failed, possibly worktree conflict)');
+                    result.warnings.push('Failed to push develop branch (checkout failed, possibly worktree conflict or branches diverged)');
                     checkoutSucceeded = false;
                 }
             }

package/dist/templates/workflow.js

@@ -76,12 +76,7 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 title: \`Deploy: \${sourceBranch} -> \${targetBranch}\`,
-                body: \`Automated deployment PR from \${sourceBranch} to \${targetBranch}.
-
-**Commit:** \${{ steps.sha.outputs.sha }}
-**Image:** \${{ env.REGISTRY }}/\${{ env.PROJECT_NAME }}-app:\${{ steps.sha.outputs.sha }}
-
-Merge this PR to trigger deployment.\`,
+                body: \`Automated deployment PR from \${sourceBranch} to \${targetBranch}.\\n\\n**Commit:** \${{ steps.sha.outputs.sha }}\\n**Image:** \${{ env.REGISTRY }}/\${{ env.PROJECT_NAME }}-app:\${{ steps.sha.outputs.sha }}\\n\\nMerge this PR to trigger deployment.\`,
                 head: sourceBranch,
                 base: targetBranch
               });
@@ -114,12 +109,7 @@ Merge this PR to trigger deployment.\`,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 title: 'Deploy to Production: staging -> main',
-                body: \`Promote staging to production.
-
-**Commit:** \${{ steps.sha.outputs.sha }}
-**Image:** \${{ env.REGISTRY }}/\${{ env.PROJECT_NAME }}-app:\${{ steps.sha.outputs.sha }}
-
-Merge this PR to deploy to production.\`,
+                body: \`Promote staging to production.\\n\\n**Commit:** \${{ steps.sha.outputs.sha }}\\n**Image:** \${{ env.REGISTRY }}/\${{ env.PROJECT_NAME }}-app:\${{ steps.sha.outputs.sha }}\\n\\nMerge this PR to deploy to production.\`,
                 head: 'staging',
                 base: 'main'
               });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoptic-it-solutions/coolify-setup",
-  "version": "1.1.28",
+  "version": "1.1.30",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",