Fixes

Author: justin808

.github/actions/deploy-to-control-plane/action.yml

@@ -71,6 +71,17 @@ runs:
       id: deploy
       shell: bash
       run: |
+        # Debug git commit information
+        echo "🔍 Debugging git commit information:"
+        echo "Current directory: $(pwd)"
+        echo "Git status:"
+        git status
+        echo "Git log (last 5 commits):"
+        git log -n 5 --oneline
+        echo "steps.get_sha.outputs.sha_short: ${{steps.get_sha.outputs.sha_short}}"
+        echo "Full SHA from git rev-parse HEAD: $(git rev-parse HEAD)"
+        echo "Short SHA from git rev-parse --short HEAD: $(git rev-parse --short HEAD)"
+        
         # Deploy rails workload
         echo "🚀 Starting deployment process..."
         echo "📦 Building image with commit SHA: ${{steps.get_sha.outputs.sha_short}}"
@@ -81,21 +92,15 @@ runs:
         # Run the command and tee output to both stdout and temp file
         set -o pipefail  # Make sure we get the correct exit code from the cpln command
         
-        echo "🔄 Updating Rails workload..."
-        if cpln workload update rails --gvc ${{ inputs.app_name }} --org ${{ inputs.org }} --set spec.containers.rails.image=/org/${{ inputs.org }}/image/${{ inputs.app_name }}:${{steps.get_sha.outputs.sha_short}} | tee "$TEMP_OUTPUT"; then
+        echo "🔄 Building and deploying with cpflow..."
+        if cpflow build-image -a ${{ inputs.app_name }} --commit=${{steps.get_sha.outputs.sha_short}} --org=${{inputs.org}} | tee "$TEMP_OUTPUT" && \
+           cpflow deploy-image -a ${{ inputs.app_name }} --run-release-phase --org ${{inputs.org}} --verbose | tee -a "$TEMP_OUTPUT"; then
+          
           # Extract the URL from the deployment output
           RAILS_URL=$(grep -o 'https://rails-[^[:space:]]*\.cpln\.app' "$TEMP_OUTPUT" || true)
           if [ -n "$RAILS_URL" ]; then
             echo "🌐 Found Rails deployment URL: $RAILS_URL"
             echo "rails_url=$RAILS_URL" >> $GITHUB_OUTPUT
-            
-            echo "🔄 Updating daily-task workload..."
-            if cpln workload update daily-task --gvc ${{ inputs.app_name }} --org ${{ inputs.org }} --set spec.containers.daily-task.image=/org/${{ inputs.org }}/image/${{ inputs.app_name }}:${{steps.get_sha.outputs.sha_short}} | tee "$TEMP_OUTPUT"; then
-              echo "✅ Both workloads updated successfully!"
-            else
-              echo "⚠️ Daily-task update failed, but Rails deployment was successful"
-            fi
-            
             rm "$TEMP_OUTPUT"
           else
             rm "$TEMP_OUTPUT"
@@ -104,6 +109,6 @@ runs:
           fi
         else
           rm "$TEMP_OUTPUT"
-          echo "❌ Rails deployment failed"
+          echo "❌ Deployment command failed"
           exit 1
         fi

.github/workflows/deploy-to-control-plane-review.yml

@@ -19,6 +19,7 @@ env:
 
 jobs:
   check-concurrent:
+    name: Deploy Review App to Control Plane / check-concurrent
     runs-on: ubuntu-latest
     outputs:
       cancelled: ${{ steps.check.outputs.cancelled }}
@@ -55,35 +56,34 @@ jobs:
 
     steps:
       - name: Create initial comment and get job URL
-        id: init
+        id: create-comment
         uses: actions/github-script@v7
         with:
           script: |
-            // Get the job ID from the Actions API
-            const { data: jobs } = await github.rest.actions.listJobsForWorkflowRun({
+            const currentJob = await github.rest.actions.getJobForWorkflowRun({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              run_id: context.runId,
-            });
-            
-            const currentJob = jobs.jobs.find(job => job.name === context.job);
-            if (!currentJob) {
-              throw new Error('Could not find current job in the workflow run');
-            }
+              job_id: context.runId
+            }).then(response => response.data);
             
             const statusUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}/job/${currentJob.id}?pr=${context.issue.number || context.payload.pull_request.number}`;
             core.exportVariable('statusUrl', statusUrl);
             
-            const message = "🚀 Starting new deployment for commit: " + context.sha.substring(0, 7) +
+            const deploymentId = Date.now().toString();
+            core.exportVariable('deploymentId', deploymentId);
+            
+            const message = "🚀 Starting new deployment [" + deploymentId + "] for commit: " + context.sha.substring(0, 7) +
             "\nChanges: " + (context.payload.commits ? context.payload.commits[0].message : '') +
             "\nStatus: " + statusUrl;
             
-            await github.rest.issues.createComment({
+            const comment = await github.rest.issues.createComment({
               issue_number: context.issue.number || context.payload.pull_request.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: message
             });
+            
+            core.setOutput('comment-id', comment.data.id);
 
       - name: Create GitHub Deployment
         id: create-deployment
@@ -146,14 +146,16 @@ jobs:
         uses: actions/github-script@v7
         env:
           RAILS_URL: ${{ steps.deploy.outputs.rails_url }}
+          COMMENT_ID: ${{ steps.create-comment.outputs.comment-id }}
+          DEPLOYMENT_ID: ${{ env.deploymentId }}
         with:
           script: |
-            const message = "✅ Deployment successful!\n\n🚀 Rails app: " + process.env.RAILS_URL + "\n📊 Status: " + process.env.statusUrl;
+            const message = "✅ Deployment [" + process.env.DEPLOYMENT_ID + "] successful!\n\n🚀 Rails app: " + process.env.RAILS_URL + "\n📊 Status: " + process.env.statusUrl;
             
-            await github.rest.issues.createComment({
-              issue_number: context.issue.number || context.payload.pull_request.number,
+            await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
+              comment_id: process.env.COMMENT_ID,
               body: message
             });
             
@@ -169,14 +171,17 @@ jobs:
       - name: Post deployment failure
         if: failure()
         uses: actions/github-script@v7
+        env:
+          COMMENT_ID: ${{ steps.create-comment.outputs.comment-id }}
+          DEPLOYMENT_ID: ${{ env.deploymentId }}
         with:
           script: |
-            const message = "❌ Deployment failed\n\nCommit: " + context.sha.substring(0, 7) + "\nWorkflow Status: " + process.env.statusUrl;
+            const message = "❌ Deployment [" + process.env.DEPLOYMENT_ID + "] failed\n\nCommit: " + context.sha.substring(0, 7) + "\nWorkflow Status: " + process.env.statusUrl;
             
-            await github.rest.issues.createComment({
-              issue_number: context.issue.number || context.payload.pull_request.number,
+            await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
+              comment_id: process.env.COMMENT_ID,
               body: message
             });