fixes

Author: justin808

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

@@ -13,6 +13,10 @@ inputs:
   github_token:
     description: 'GitHub token'
     required: true
+  wait_timeout:
+    description: 'Timeout in seconds for waiting for workloads to be ready'
+    required: false
+    default: 600
 
 outputs:
   rails_url:
@@ -39,23 +43,28 @@ runs:
       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
+        # Deploy the application and capture the Rails URL
+        if ! DEPLOY_OUTPUT=$(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"
+        # Extract Rails URL from deployment output
+        RAILS_URL=$(echo "$DEPLOY_OUTPUT" | grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' | head -n1)
+        if [ -z "$RAILS_URL" ]; then
+          echo "❌ Failed to get Rails URL from deployment output"
           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"
+        # Wait for all workloads to be ready
+        WAIT_TIMEOUT=${WAIT_TIMEOUT:-${inputs.wait_timeout}}
+        echo "⏳ Waiting for all workloads to be ready (timeout: ${WAIT_TIMEOUT}s)..."
+        if ! timeout $WAIT_TIMEOUT cpflow ps:wait -a ${{ inputs.app_name }}; then
+          if [ $? -eq 124 ]; then
+            echo "❌ Timed out waiting for workloads after ${WAIT_TIMEOUT} seconds"
+          else
+            echo "❌ Workloads did not become ready for PR #$PR_NUMBER"
+          fi
           exit 1
         fi
         

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

@@ -163,6 +163,27 @@ jobs:
           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: Update Status - Building
+        if: steps.determine_action.outputs.action == 'deploy'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const result = ${{ steps.init-deployment.outputs.result }};
+            const commentId = result.commentId;
+            
+            const buildingMessage = [
+              '🏗️ Building Docker image for PR #' + process.env.PR_NUMBER + ', commit ' + '${{ env.COMMIT_HASH }}',
+              '',
+              '[View Build Logs](' + result.workflowUrl + ')'
+            ].join('\n');
+            
+            await github.rest.issues.updateComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: commentId,
+              body: buildingMessage
+            });
+
       - name: Build Docker Image
         if: steps.determine_action.outputs.action == 'deploy'
         uses: ./.github/actions/build-docker-image
@@ -172,6 +193,29 @@ jobs:
           commit: ${{ env.COMMIT_HASH }}
           PR_NUMBER: ${{ env.PR_NUMBER }}
 
+      - name: Update Status - Deploying
+        if: steps.determine_action.outputs.action == 'deploy'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const result = ${{ steps.init-deployment.outputs.result }};
+            const commentId = result.commentId;
+            
+            const deployingMessage = [
+              '🚀 Deploying to Control Plane for PR #' + process.env.PR_NUMBER + ', commit ' + '${{ env.COMMIT_HASH }}',
+              '',
+              '⏳ Waiting for deployment to be ready...',
+              '',
+              '[View Deploy Logs](' + result.workflowUrl + ')'
+            ].join('\n');
+            
+            await github.rest.issues.updateComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: commentId,
+              body: deployingMessage
+            });
+
       - name: Deploy to Control Plane
         if: steps.determine_action.outputs.action == 'deploy'
         id: deploy
@@ -181,7 +225,7 @@ jobs:
           org: ${{ env.CPLN_ORG }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Update Status
+      - name: Update Status - Deployment Complete
         if: steps.determine_action.outputs.action == 'deploy'
         uses: actions/github-script@v7
         with: