Changes made:

Fixed the workflow URL to include the job ID by using context.job.id
Improved the deployment timeout handling:
Wrapped ps:wait in bash -c to ensure proper signal handling
Added more detailed error output including the deployment output
Fixed variable expansion for WAIT_TIMEOUT
Added exit code to error message for better debugging
Added deployment output to error messages to help diagnose issues
The workflow URL will now correctly point to the specific job, and we should get better error messages if the deployment fails or times out.

Author: justin808

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

@@ -53,18 +53,25 @@ runs:
         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"
+          echo "Deployment output:"
+          echo "$DEPLOY_OUTPUT"
           exit 1
         fi
         
         # Wait for all workloads to be ready
-        WAIT_TIMEOUT=${WAIT_TIMEOUT:-${inputs.wait_timeout}}
+        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
+        
+        # Use timeout command with ps:wait
+        if ! timeout $WAIT_TIMEOUT bash -c "cpflow ps:wait -a ${{ inputs.app_name }}"; then
+          TIMEOUT_EXIT=$?
+          if [ $TIMEOUT_EXIT -eq 124 ]; then
             echo "❌ Timed out waiting for workloads after ${WAIT_TIMEOUT} seconds"
           else
-            echo "❌ Workloads did not become ready for PR #$PR_NUMBER"
+            echo "❌ Workloads did not become ready for PR #$PR_NUMBER (exit code: $TIMEOUT_EXIT)"
           fi
+          echo "Last deployment output:"
+          echo "$DEPLOY_OUTPUT"
           exit 1
         fi
         

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

@@ -24,7 +24,7 @@ jobs:
     if: |
       github.event_name == 'pull_request' || 
       (github.event_name == 'issue_comment' && 
-       (github.event.comment.body == '/deploy-review-pp' || 
+       (github.event.comment.body == '/deploy-review-app' || 
         github.event.comment.body == '/delete-review-app') && 
        github.event.issue.pull_request)
     runs-on: ubuntu-latest
@@ -116,10 +116,11 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const prNumber = process.env.PR_NUMBER;
-            const getWorkflowUrl = (runId) => 
-              `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
+            function getWorkflowUrl(runId) {
+              return `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}/job/${context.job.id}`;
+            }
             
+            const prNumber = process.env.PR_NUMBER;
             const getJobUrl = (runId, jobId, prNumber) =>
               `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}/job/${jobId}?pr=${prNumber}`;