wip

Author: justin808

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

@@ -37,6 +37,14 @@ runs:
         GITHUB_TOKEN: ${{ inputs.github_token }}
         PR_NUMBER: ${{ env.PR_NUMBER }}
 
+    - name: Setup Control Plane App If It Doesn't Exist
+      shell: bash
+      run: |
+        if ! cpflow exists -a ${{ inputs.app_name }} ; then
+          echo " Setting up new Control Plane app for app ${{ inputs.app_name }}..."
+          cpflow setup-app -a ${{ inputs.app_name }}
+        fi
+
     - name: Deploy to Control Plane
       id: deploy
       shell: bash

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This script handles the deployment to Control Plane and extracts the Rails URL
-# 
+#
 # Required environment variables:
 # - APP_NAME: Name of the application to deploy
 # - CPLN_ORG: Control Plane organization
@@ -31,21 +31,33 @@ trap 'rm -f "$TEMP_OUTPUT"' EXIT
 
 # 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 | tee "$TEMP_OUTPUT"; then
-    # Extract Rails URL from deployment output
-    RAILS_URL=$(grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' "$TEMP_OUTPUT" | head -n1)
-    if [ -n "$RAILS_URL" ]; then
-        echo "rails_url=$RAILS_URL" >> "$GITHUB_OUTPUT"
-        echo "✅ Deployment successful"
-        echo "🚀 Rails URL: $RAILS_URL"
-    else
-        echo "❌ Failed to extract Rails URL from deployment output"
-        exit 1
-    fi
-elif [ $? -eq 124 ]; then
-    echo "❌ Deployment timed out after $WAIT_TIMEOUT seconds"
-    exit 1
-else
-    echo "❌ Deployment to Control Plane failed"
-    exit 1
+if ! timeout "$WAIT_TIMEOUT" cpflow deploy-image -a "$APP_NAME" --run-release-phase --org "$CPLN_ORG" --verbose | tee "$TEMP_OUTPUT"; then
+  echo "❌ Deployment failed"
+  echo "Error output:"
+  exit 1
+fi
+
+# Extract app URL from deployment output
+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"
+  exit 1
 fi
+
+# Wait for all workloads to be ready
+echo "⏳ Waiting for all workloads to be ready (timeout: ${WAIT_TIMEOUT}s)"
+if ! timeout "${WAIT_TIMEOUT}" bash -c "cpflow ps:wait -a \"$APP_NAME\"" 2>&1 | tee -a "$TEMP_OUTPUT"; 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"
+  fi
+  echo "Full output:"
+  cat "$TEMP_OUTPUT"
+  exit 1
+fi
+
+echo "✅ Deployment successful"
+echo "🌐 Rails URL: $RAILS_URL"
+echo "rails_url=$RAILS_URL" >> "$GITHUB_OUTPUT"