@panoptic-it-solutions/coolify-setup 1.1.29 → 1.1.31

package/dist/git.js

@@ -237,50 +237,75 @@ export async function setupGitHub(projectName) {
         }
     }
     // Ensure we're on develop branch and push to it
+    // Skip if there are uncommitted changes - commitAndPushToDevelop will handle it
+    let hasUncommittedChanges = false;
     try {
-        const currentBranch = run('git branch --show-current') || 'develop';
-        if (currentBranch !== 'develop') {
-            // Try to checkout develop
-            let checkoutSucceeded = false;
-            try {
-                // Check if develop exists locally
+        const status = run('git status --porcelain');
+        hasUncommittedChanges = status.length > 0;
+    }
+    catch {
+        // If status check fails, proceed anyway
+    }
+    if (!hasUncommittedChanges) {
+        // Only try to push develop if there are no uncommitted changes
+        // (commitAndPushToDevelop will handle it after committing)
+        try {
+            const currentBranch = run('git branch --show-current') || 'develop';
+            if (currentBranch !== 'develop') {
+                // Try to checkout develop
+                let checkoutSucceeded = false;
                 try {
-                    run('git rev-parse --verify develop');
-                    run('git checkout develop');
+                    // Check if develop exists locally
+                    try {
+                        run('git rev-parse --verify develop');
+                        run('git checkout develop');
+                    }
+                    catch {
+                        // Create develop from current branch
+                        run('git checkout -b develop');
+                    }
+                    checkoutSucceeded = true;
                 }
                 catch {
-                    // Create develop from current branch
-                    run('git checkout -b develop');
+                    // Checkout failed - might be worktree issue
+                    // 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;
+                        // Skip the rest of develop push logic since we already pushed
+                        checkoutSucceeded = false;
+                    }
+                    catch {
+                        result.warnings.push('Failed to push develop branch (checkout failed, possibly worktree conflict or branches diverged)');
+                        checkoutSucceeded = false;
+                    }
                 }
-                checkoutSucceeded = true;
-            }
-            catch {
-                // Checkout failed - might be worktree issue
-                // Try to push current branch to develop instead (if fast-forward possible)
-                try {
-                    // First fetch to check if develop exists remotely
+                if (checkoutSucceeded) {
+                    // Pull latest changes before pushing to avoid non-fast-forward errors
                     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}`);
+                        run('git pull --rebase origin develop');
                     }
                     catch {
-                        // Either develop doesn't exist remotely, or can't fast-forward
-                        // Try push anyway - will fail if develop exists and diverged
+                        // Pull might fail if remote doesn't exist yet, that's ok
                     }
-                    run(`git push origin ${currentBranch}:develop -u`);
+                    run('git push origin develop -u');
                     result.developBranchCreated = true;
                     result.repoPushed = true;
-                    // Skip the rest of develop push logic since we already pushed
-                    checkoutSucceeded = false;
-                }
-                catch {
-                    result.warnings.push('Failed to push develop branch (checkout failed, possibly worktree conflict or branches diverged)');
-                    checkoutSucceeded = false;
                 }
             }
-            if (checkoutSucceeded) {
-                // Pull latest changes before pushing to avoid non-fast-forward errors
+            else {
+                // Already on develop
                 try {
                     run('git pull --rebase origin develop');
                 }
@@ -292,22 +317,10 @@ export async function setupGitHub(projectName) {
                 result.repoPushed = true;
             }
         }
-        else {
-            // Already on develop
-            try {
-                run('git pull --rebase origin develop');
-            }
-            catch {
-                // Pull might fail if remote doesn't exist yet, that's ok
-            }
-            run('git push origin develop -u');
-            result.developBranchCreated = true;
-            result.repoPushed = true;
+        catch {
+            result.warnings.push('Failed to push develop branch');
         }
     }
-    catch {
-        result.warnings.push('Failed to push develop branch');
-    }
     // Create main branch from develop if it doesn't exist
     try {
         // Check if main exists remotely

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.29",
+  "version": "1.1.31",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",