rework-main-job-deploy

Author: justin808

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

@@ -48,11 +48,11 @@ jobs:
 
       - name: Verify Environment Variables
         run: |
-          # Required secrets
+          # Required actions secrets
           : "${GITHUB_TOKEN:?Required secret GITHUB_TOKEN not set}"
           : "${CPLN_TOKEN:?Required secret CPLN_TOKEN_STAGING not set}"
           
-          # Required variables
+          # Required actions variables
           : "${CPLN_ORG:?Required variable CPLN_ORG_STAGING not set}"
           : "${STAGING_APP_NAME:?Required variable STAGING_APP_NAME not set}"
           : "${REVIEW_APP_PREFIX:?Required variable REVIEW_APP_PREFIX not set}"
@@ -104,8 +104,12 @@ jobs:
             echo "SHOULD_DEPLOY=true" >> $GITHUB_OUTPUT
             setup_pr_deployment "${{ github.event.issue.number }}"
           elif [[ "${{ github.event_name }}" == "push" ]]; then
-            PR_NUMBER=$(gh pr list --head ${{ github.ref_name }} --json number --jq '.[0].number')
+            # Get PR number for the current branch, handling refs/heads/ prefix
+            BRANCH_NAME="${{ github.ref_name }}"
+            PR_NUMBER=$(gh pr list --head "$BRANCH_NAME" --json number,state --jq '.[] | select(.state=="OPEN") | .number')
+            
             if [ -n "$PR_NUMBER" ]; then
+              echo "Found PR #$PR_NUMBER for branch $BRANCH_NAME"
               APP_NAME="${{ env.REVIEW_APP_PREFIX }}-pr-$PR_NUMBER"
               if check_app_exists "$APP_NAME"; then
                 echo "SHOULD_DEPLOY=true" >> $GITHUB_OUTPUT
@@ -114,6 +118,7 @@ jobs:
                 no_deployment "No existing review app found for PR $PR_NUMBER"
               fi
             else
+              echo "No open PR found for branch $BRANCH_NAME"
               no_deployment "No PR found for this branch"
             fi
           else
@@ -156,7 +161,7 @@ jobs:
             }
 
       - name: Create Initial Comment
-        if: env.IS_STAGING != 'true'
+        if: env.IS_STAGING != 'true' && env.PR_NUMBER != ''
         id: create-comment
         uses: actions/github-script@v7
         with: