big-refactor-might-not-work

Author: justin808

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

@@ -172,14 +172,6 @@ runs:
             body: buildingMessage
           });
 
-    - name: Build Docker Image
-      uses: ./.github/actions/build-docker-image
-      with:
-        app_name: ${{ inputs.app_name }}
-        org: ${{ inputs.org }}
-        commit: ${{ env.COMMIT_HASH }}
-        PR_NUMBER: ${{ env.PR_NUMBER }}
-
     - name: Update Status - Deploying
       uses: actions/github-script@v7
       with:

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

@@ -29,6 +29,15 @@ fi
 TEMP_OUTPUT=$(mktemp)
 trap 'rm -f "$TEMP_OUTPUT"' EXIT
 
+# Build the Docker image
+echo "🏗️ Building Docker image"
+if ! cpflow build-image -a "$APP_NAME" --org "$CPLN_ORG" --verbose 2>&1 | tee "$TEMP_OUTPUT"; then
+  echo "❌ Image build failed"
+  echo "Full output:"
+  cat "$TEMP_OUTPUT"
+  exit 1
+fi
+
 # Deploy the application
 echo "🚀 Deploying to Control Plane (timeout: ${WAIT_TIMEOUT}s)"
 if ! timeout "${WAIT_TIMEOUT}" cpflow deploy-image -a "$APP_NAME" --run-release-phase --org "$CPLN_ORG" --verbose 2>&1 | tee "$TEMP_OUTPUT"; then
@@ -42,7 +51,7 @@ fi
 RAILS_URL=$(grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' "$TEMP_OUTPUT" | head -n1)
 if [ -z "$RAILS_URL" ]; then
   echo "❌ Failed to get app URL from deployment output"
-  echo "Deployment output:"
+  echo "Full output:"
   cat "$TEMP_OUTPUT"
   exit 1
 fi

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

@@ -92,13 +92,30 @@ jobs:
 
       - name: Checkout PR Branch
         if: |
-          github.event_name == 'issue_comment' || 
+          (github.event_name == 'issue_comment' && 
+           github.event.issue.pull_request && 
+           github.event.comment.body == '/deploy-review-app') || 
           (steps.get-pr.outputs.has_pr == 'true' && steps.check-app.outputs.app_exists == 'true')
         run: git checkout ${{ steps.getRef.outputs.PR_REF }}
 
+      - name: Build Docker Image
+        if: |
+          (github.event_name == 'issue_comment' && 
+           github.event.issue.pull_request && 
+           github.event.comment.body == '/deploy-review-app') || 
+          (steps.get-pr.outputs.has_pr == 'true' && steps.check-app.outputs.app_exists == 'true')
+        uses: ./.github/actions/build-docker-image
+        with:
+          app_name: ${{ env.APP_NAME }}
+          org: ${{ env.CPLN_ORG }}
+          commit: ${{ steps.getRef.outputs.PR_SHA }}
+          PR_NUMBER: ${{ env.PR_NUMBER }}
+
       - name: Deploy to Control Plane
         if: |
-          github.event_name == 'issue_comment' || 
+          (github.event_name == 'issue_comment' && 
+           github.event.issue.pull_request && 
+           github.event.comment.body == '/deploy-review-app') || 
           (steps.get-pr.outputs.has_pr == 'true' && steps.check-app.outputs.app_exists == 'true')
         uses: ./.github/actions/deploy-to-control-plane
         with: