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

package/dist/generator.js

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, writeFileSync, readFileSync, unlinkSync, readdirSync, rmSync } from 'fs';
 import { join, dirname } from 'path';
 import { execSync } from 'child_process';
-import { generateDockerfile, generateDockerCompose, generateDockerComposeBuild, generateWorkflow, generateEntrypoint, generateMigrateScript, generateClaudeRules, } from './templates/index.js';
+import { generateDockerfile, generateDockerCompose, generateDockerComposeBuild, generateWorkflow, generateStagingWorkflow, generateEntrypoint, generateMigrateScript, generateClaudeRules, } from './templates/index.js';
 function ensureDir(filePath) {
     const dir = dirname(filePath);
     if (!existsSync(dir)) {
@@ -157,6 +157,9 @@ export async function generateFiles(options) {
         projectName,
     });
     writeFile('.github/workflows/build-deploy.yml', workflow);
+    // Generate staging version workflow
+    const stagingWorkflow = generateStagingWorkflow();
+    writeFile('.github/workflows/staging-version.yml', stagingWorkflow);
     // Generate entrypoint.sh
     const entrypoint = generateEntrypoint({
         projectType,

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/index.js

@@ -81,6 +81,7 @@ async function main() {
         'docker-compose.yml',
         'docker-compose.build.yml',
         '.github/workflows/build-deploy.yml',
+        '.github/workflows/staging-version.yml',
         '.claude/rules/coolify.md',
         'entrypoint.sh',
         'package.json', // May be modified with esbuild
@@ -111,6 +112,7 @@ async function main() {
     console.log(chalk.green('  ✓ docker-compose.yml'));
     console.log(chalk.green('  ✓ docker-compose.build.yml'));
     console.log(chalk.green('  ✓ .github/workflows/build-deploy.yml'));
+    console.log(chalk.green('  ✓ .github/workflows/staging-version.yml'));
     console.log(chalk.green('  ✓ .claude/rules/coolify.md'));
     console.log(chalk.green('  ✓ entrypoint.sh'));
     if (response.includePostgres) {

package/dist/templates/index.d.ts

@@ -2,6 +2,7 @@ export { generateDockerfile, type DockerfileOptions } from './dockerfile.js';
 export { generateDockerCompose, type DockerComposeOptions } from './docker-compose.js';
 export { generateDockerComposeBuild, type DockerComposeBuildOptions } from './docker-compose-build.js';
 export { generateWorkflow, type WorkflowOptions } from './workflow.js';
+export { generateStagingWorkflow } from './staging-workflow.js';
 export { generateEntrypoint, type EntrypointOptions } from './entrypoint.js';
 export { generateMigrateScript, type MigrateScriptOptions } from './migrate.js';
 export { generateClaudeRules } from './claude-rules.js';

package/dist/templates/index.js

@@ -2,6 +2,7 @@ export { generateDockerfile } from './dockerfile.js';
 export { generateDockerCompose } from './docker-compose.js';
 export { generateDockerComposeBuild } from './docker-compose-build.js';
 export { generateWorkflow } from './workflow.js';
+export { generateStagingWorkflow } from './staging-workflow.js';
 export { generateEntrypoint } from './entrypoint.js';
 export { generateMigrateScript } from './migrate.js';
 export { generateClaudeRules } from './claude-rules.js';

package/dist/templates/staging-workflow.d.ts

@@ -0,0 +1 @@
+export declare function generateStagingWorkflow(): string;

package/dist/templates/staging-workflow.js

@@ -0,0 +1,176 @@
+export function generateStagingWorkflow() {
+    return `name: Staging Version
+
+on:
+  push:
+    branches:
+      - staging
+
+permissions:
+  contents: write
+
+jobs:
+  version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: \${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Get last staging tag
+        id: last_tag
+        run: |
+          LAST_TAG=\$(git tag -l "staging-v*" --sort=-v:refname | head -n1)
+          if [ -z "\$LAST_TAG" ]; then
+            LAST_TAG=\$(git rev-list --max-parents=0 HEAD)
+          fi
+          echo "tag=\$LAST_TAG" >> \$GITHUB_OUTPUT
+
+      - name: Determine version bump from commits
+        id: bump
+        run: |
+          COMMITS=\$(git log \${{ steps.last_tag.outputs.tag }}..HEAD --pretty=format:"%s" 2>/dev/null || git log --pretty=format:"%s")
+
+          BUMP="patch"
+
+          if echo "\$COMMITS" | grep -qiE "^feat(\\(.+\\))?!:|BREAKING CHANGE:"; then
+            BUMP="major"
+          elif echo "\$COMMITS" | grep -qiE "^feat(\\(.+\\))?:"; then
+            BUMP="minor"
+          fi
+
+          echo "type=\$BUMP" >> \$GITHUB_OUTPUT
+
+      - name: Bump version
+        id: version
+        run: |
+          CURRENT=\$(node -p "require('./package.json').version")
+          LAST_TAG="\${{ steps.last_tag.outputs.tag }}"
+
+          # Check if HEAD is the same as the last tag (rerun scenario with no new commits)
+          LAST_TAG_SHA=\$(git rev-parse "\$LAST_TAG" 2>/dev/null || echo "")
+          HEAD_SHA=\$(git rev-parse HEAD)
+
+          if [ "\$LAST_TAG_SHA" = "\$HEAD_SHA" ]; then
+            echo "HEAD is at \$LAST_TAG, no new commits to version"
+            echo "version=\$CURRENT" >> \$GITHUB_OUTPUT
+            echo "skip_commit=true" >> \$GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Check if there are any commits since last tag (excluding version bump commits)
+          NEW_COMMITS=\$(git log "\$LAST_TAG"..HEAD --pretty=format:"%s" --invert-grep --grep="^chore(release):" 2>/dev/null | head -1)
+          if [ -z "\$NEW_COMMITS" ]; then
+            echo "No new commits since \$LAST_TAG (only release commits)"
+            echo "version=\$CURRENT" >> \$GITHUB_OUTPUT
+            echo "skip_commit=true" >> \$GITHUB_OUTPUT
+            exit 0
+          fi
+
+          IFS='.' read -r MAJOR MINOR PATCH <<< "\$CURRENT"
+
+          case "\${{ steps.bump.outputs.type }}" in
+            major)
+              MAJOR=\$((MAJOR + 1))
+              MINOR=0
+              PATCH=0
+              ;;
+            minor)
+              MINOR=\$((MINOR + 1))
+              PATCH=0
+              ;;
+            patch)
+              PATCH=\$((PATCH + 1))
+              ;;
+          esac
+
+          NEW_VERSION="\${MAJOR}.\${MINOR}.\${PATCH}"
+          npm version \$NEW_VERSION --no-git-tag-version
+
+          echo "version=\$NEW_VERSION" >> \$GITHUB_OUTPUT
+          echo "skip_commit=false" >> \$GITHUB_OUTPUT
+
+      - name: Generate changelog
+        id: changelog
+        if: steps.version.outputs.skip_commit != 'true'
+        run: |
+          LAST_TAG="\${{ steps.last_tag.outputs.tag }}"
+
+          {
+            echo "changelog<<EOF"
+            echo "## Changes in v\${{ steps.version.outputs.version }}"
+            echo ""
+
+            # Features
+            FEATURES=\$(git log \$LAST_TAG..HEAD --pretty=format:"- %s" --grep="^feat" 2>/dev/null || true)
+            if [ -n "\$FEATURES" ]; then
+              echo "### Features"
+              echo "\$FEATURES"
+              echo ""
+            fi
+
+            # Fixes
+            FIXES=\$(git log \$LAST_TAG..HEAD --pretty=format:"- %s" --grep="^fix" 2>/dev/null || true)
+            if [ -n "\$FIXES" ]; then
+              echo "### Bug Fixes"
+              echo "\$FIXES"
+              echo ""
+            fi
+
+            # Other changes
+            OTHERS=\$(git log \$LAST_TAG..HEAD --pretty=format:"- %s" --invert-grep --grep="^feat" --grep="^fix" 2>/dev/null | head -20 || true)
+            if [ -n "\$OTHERS" ]; then
+              echo "### Other Changes"
+              echo "\$OTHERS"
+              echo ""
+            fi
+
+            echo "EOF"
+          } >> \$GITHUB_OUTPUT
+
+      - name: Commit version bump
+        if: steps.version.outputs.skip_commit != 'true'
+        run: |
+          git add package.json
+          git commit -m "chore(release): v\${{ steps.version.outputs.version }}"
+
+      - name: Create and push tag
+        if: steps.version.outputs.skip_commit != 'true'
+        run: |
+          TAG_NAME="staging-v\${{ steps.version.outputs.version }}"
+          # Check if tag already exists
+          if git rev-parse "\$TAG_NAME" >/dev/null 2>&1; then
+            EXISTING_SHA=\$(git rev-parse "\$TAG_NAME")
+            CURRENT_SHA=\$(git rev-parse HEAD)
+            if [ "\$EXISTING_SHA" = "\$CURRENT_SHA" ]; then
+              echo "Tag \$TAG_NAME already exists at current commit, skipping"
+            else
+              echo "Error: Tag \$TAG_NAME exists at different commit"
+              exit 1
+            fi
+          else
+            git tag "\$TAG_NAME"
+          fi
+          git push origin staging --tags
+
+      - name: Output version info
+        run: |
+          echo "## Version Summary" >> \$GITHUB_STEP_SUMMARY
+          echo "" >> \$GITHUB_STEP_SUMMARY
+          echo "**Version:** v\${{ steps.version.outputs.version }}" >> \$GITHUB_STEP_SUMMARY
+          echo "**Bump Type:** \${{ steps.bump.outputs.type }}" >> \$GITHUB_STEP_SUMMARY
+          echo "**Skipped:** \${{ steps.version.outputs.skip_commit }}" >> \$GITHUB_STEP_SUMMARY
+`;
+}

package/package.json

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