fixes

Author: justin808

.github/actions/build-docker-image/action.yml

@@ -11,6 +11,9 @@ inputs:
   commit:
     description: 'Commit SHA to tag the image with'
     required: true
+  PR_NUMBER:
+    description: 'PR number'
+    required: true
 
 runs:
   using: "composite"
@@ -19,11 +22,11 @@ runs:
       id: build
       shell: bash
       run: |
-        echo "🏗️ Building Docker image for commit ${{ inputs.commit }}..."
+        echo "🏗️ Building Docker image for PR #$PR_NUMBER (commit ${{ inputs.commit }})..."
         
         if cpflow build-image -a ${{ inputs.app_name }} --commit=${{ inputs.commit }} --org=${{ inputs.org }}; then
-          echo "✅ Docker image build successful for commit ${{ inputs.commit }}"
+          echo "✅ Docker image build successful for PR #$PR_NUMBER (commit ${{ inputs.commit }})"
         else
-          echo "❌ Docker image build failed for commit ${{ inputs.commit }}"
+          echo "❌ Docker image build failed for PR #$PR_NUMBER (commit ${{ inputs.commit }})"
           exit 1
         fi

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

@@ -1,7 +1,7 @@
 # Control Plane GitHub Action
 
 name: Deploy to Control Plane
-description: 'Deploys the application to Control Plane'
+description: 'Deploys an application to Control Plane'
 
 inputs:
   app_name:
@@ -36,7 +36,29 @@ runs:
     - name: Deploy to Control Plane
       id: deploy
       shell: bash
-      run: ${{ github.action_path }}/scripts/deploy.sh
-      env:
-        APP_NAME: ${{ inputs.app_name }}
-        CPLN_ORG: ${{ inputs.org }}
+      run: |
+        echo "🚀 Deploying app for PR #$PR_NUMBER..."
+        
+        # Deploy the application using the already-built image
+        if ! cpflow deploy-image -a ${{ inputs.app_name }} --run-release-phase --org ${{ inputs.org }}; then
+          echo "❌ Deployment failed for PR #$PR_NUMBER"
+          exit 1
+        fi
+        
+        # Wait for the deployment to be ready
+        echo "⏳ Waiting for deployment to be ready..."
+        if ! cpflow wait-ready -a ${{ inputs.app_name }} --org=${{ inputs.org }} --timeout=300; then
+          echo "❌ Deployment did not become ready for PR #$PR_NUMBER"
+          exit 1
+        fi
+        
+        # Get the Rails URL
+        RAILS_URL=$(cpflow get-url -a ${{ inputs.app_name }} --org=${{ inputs.org }})
+        if [ -z "$RAILS_URL" ]; then
+          echo "❌ Failed to get Rails URL for PR #$PR_NUMBER"
+          exit 1
+        fi
+        
+        echo "✅ Deployment successful for PR #$PR_NUMBER"
+        echo "🌐 Rails URL: $RAILS_URL"
+        echo "rails_url=$RAILS_URL" >> $GITHUB_OUTPUT

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

@@ -14,21 +14,13 @@ set -e
 # Validate required environment variables
 : "${APP_NAME:?APP_NAME environment variable is required}"
 : "${CPLN_ORG:?CPLN_ORG environment variable is required}"
-: "${GITHUB_SHA:?GITHUB_SHA environment variable is required}"
 
 # Set deployment timeout (15 minutes)
 TIMEOUT=900
 
 TEMP_OUTPUT=$(mktemp)
 trap 'rm -f "$TEMP_OUTPUT"' EXIT
 
-# 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 timeout "$TIMEOUT" cpflow deploy-image -a "$APP_NAME" --run-release-phase --org "$CPLN_ORG" --verbose | tee "$TEMP_OUTPUT"; then

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

@@ -157,14 +157,20 @@ jobs:
               workflowUrl: getWorkflowUrl(context.runId)
             };
 
+      - name: Set commit hash
+        if: steps.determine_action.outputs.action == 'deploy'
+        run: |
+          FULL_COMMIT="${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || steps.getRef.outputs.PR_SHA || github.sha }}"
+          echo "COMMIT_HASH=${FULL_COMMIT:0:7}" >> $GITHUB_ENV
+
       - name: Build Docker Image
         if: steps.determine_action.outputs.action == 'deploy'
         uses: ./.github/actions/build-docker-image
         with:
           app_name: ${{ env.APP_NAME }}
           org: ${{ env.CPLN_ORG }}
-          # Use the same commit resolution as checkout
-          commit: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || steps.getRef.outputs.PR_SHA || github.sha }}
+          commit: ${{ env.COMMIT_HASH }}
+          PR_NUMBER: ${{ env.PR_NUMBER }}
 
       - name: Deploy to Control Plane
         if: steps.determine_action.outputs.action == 'deploy'