fixes

Author: justin808

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

@@ -35,13 +35,6 @@ runs:
         GITHUB_TOKEN: ${{ inputs.github_token }}
         PR_NUMBER: ${{ env.PR_NUMBER }}
 
-    - name: Build Docker Image
-      uses: ./.github/actions/build-docker-image
-      with:
-        app_name: ${{ inputs.app_name }}
-        org: ${{ inputs.org }}
-        commit: ${{ github.sha }}
-
     - name: Deploy to Control Plane
       id: deploy
       shell: bash

.github/actions/deploy-to-control-plane/scripts/deploy.sh

@@ -11,22 +11,30 @@
 
 set -e
 
-echo "🚀 Deploying to Control Plane..."
 TEMP_OUTPUT=$(mktemp)
 
-# Deploy the application and capture output
+# Build the Docker image
+echo "🏗️ Building Docker image..."
+if ! cpflow build-image -a "$APP_NAME" --commit="$GITHUB_SHA" --org="$CPLN_ORG"; then
+    echo "❌ Docker image build failed"
+    exit 1
+fi
+
+# Deploy the application
+echo "🚀 Deploying to Control Plane..."
 if cpflow deploy-image -a "$APP_NAME" --run-release-phase --org "$CPLN_ORG" --verbose | tee "$TEMP_OUTPUT"; then
     # Extract Rails URL from deployment output
     RAILS_URL=$(grep -o 'https://rails-[^[:space:]]*\.cpln\.app' "$TEMP_OUTPUT")
     if [ -n "$RAILS_URL" ]; then
         echo "rails_url=$RAILS_URL" >> $GITHUB_OUTPUT
-        echo "✅ Deployment successful: $RAILS_URL"
+        echo "✅ Deployment successful"
+        echo "🚀 Rails URL: $RAILS_URL"
     else
-        echo "❌ Failed to extract Rails URL"
+        echo "❌ Failed to extract Rails URL from deployment output"
         exit 1
     fi
 else
-    echo "❌ Deployment failed"
+    echo "❌ Deployment to Control Plane failed"
     exit 1
 fi
 

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

@@ -1,4 +1,6 @@
-name: Deploy Review or Staging App
+name: Deploy to Control Plane
+
+run-name: ${{ github.event_name == 'pull_request' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) ? 'Deploying Review App' : format('Deploying {0} to Staging App', github.ref_name) }}
 
 on:
   pull_request:
@@ -155,25 +157,25 @@ jobs:
             await github.rest.repos.createDeploymentStatus(deploymentStatus);
             
             // Update the initial comment
-            const message = isSuccess
-              ? [
-                  '✅ Deployment Successful for PR ' + prNumber,
-                  '',
-                  '🚀 Rails App: [' + railsUrl + '](' + railsUrl + ')',
-                  '',
-                  '[View Workflow Status](' + workflowUrl + ')'
-                ].join('\n')
-              : [
-                  '❌ Deployment failed for PR ' + prNumber,
-                  '',
-                  'Commit: ' + context.sha.substring(0, 7),
-                  '',
-                  '[View Workflow Status](' + workflowUrl + ')'
-                ].join('\n');
+            const successMessage = [
+              '✅ Deployment Successful for PR ' + prNumber,
+              '',
+              '🚀 Rails App: [' + railsUrl + '](' + railsUrl + ')',
+              '',
+              '[View Workflow Status](' + workflowUrl + ')'
+            ].join('\n');
+            
+            const failureMessage = [
+              '❌ Deployment failed for PR ' + prNumber,
+              '',
+              'Commit: ' + context.sha.substring(0, 7),
+              '',
+              '[View Workflow Status](' + workflowUrl + ')'
+            ].join('\n');
             
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
               comment_id: commentId,
-              body: message
+              body: isSuccess ? successMessage : failureMessage
             });