rework-main-job-deploy

Author: justin808

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

@@ -1,6 +1,6 @@
 name: Deploy to Control Plane
 
-run-name: ${{ github.event_name == 'issue_comment' && format('Deploying Review App for {0}', github.ref_name) || github.ref == 'main' && 'Deploying to Staging' || format('Deploying Review App for {0}', github.ref_name) }}
+run-name: ${{ github.event_name == 'issue_comment' && format('Deploying Review App for {0}', github.ref_name) || github.ref == '${{ steps.default-branch.outputs.name }}' && 'Deploying to Staging' || format('Deploying Review App for {0}', github.ref_name) }}
 
 on:
   issue_comment:
@@ -15,7 +15,7 @@ on:
 
 # Use concurrency to cancel in-progress runs
 concurrency:
-  group: ${{ github.ref == 'main' && 'deploy-staging' || format('deploy-pr-{0}', github.event.issue.number) }}
+  group: ${{ github.ref == '${{ steps.default-branch.outputs.name }}' && 'deploy-staging' || format('deploy-pr-{0}', github.event.issue.number) }}
   cancel-in-progress: true
 
 jobs:
@@ -37,7 +37,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
-      CPLN_ORG: ${{ secrets.CPLN_ORG_STAGING }}
+      CPLN_ORG: ${{ vars.CPLN_ORG_STAGING }}
       STAGING_APP_NAME: ${{ vars.STAGING_APP_NAME }}
       REVIEW_APP_PREFIX: ${{ vars.REVIEW_APP_PREFIX }}
 
@@ -48,19 +48,16 @@ jobs:
 
       - name: Verify Environment Variables
         run: |
-          # Required environment variables
-          : "${CPLN_ORG:?Required environment variable not set}"
-          : "${CPLN_TOKEN:?Required environment variable not set}"
-          : "${REVIEW_APP_PREFIX:?Required environment variable not set}"
-          : "${STAGING_APP_NAME:?Required environment variable not set}"
+          # Required secrets
+          : "${GITHUB_TOKEN:?Required secret GITHUB_TOKEN not set}"
+          : "${CPLN_TOKEN:?Required secret CPLN_TOKEN_STAGING not set}"
           
-          echo "All required environment variables are set"
-
-      - name: Set Default Branch
-        id: default-branch
-        run: |
-          DEFAULT_BRANCH="main"
-          echo "DEFAULT_BRANCH=$DEFAULT_BRANCH" >> $GITHUB_ENV
+          # Required 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}"
+          
+          echo "All required secrets and variables are set"
 
       - name: Setup Deployment Configuration
         id: setup
@@ -92,8 +89,12 @@ jobs:
             exit 0
           }
           
+          # Get default branch
+          DEFAULT_BRANCH="refs/heads/$(gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name')"
+          echo "DEFAULT_BRANCH=$DEFAULT_BRANCH" >> $GITHUB_OUTPUT
+          
           # Check if we should deploy
-          if [[ "${{ github.ref }}" == "${{ env.DEFAULT_BRANCH }}" ]]; then
+          if [[ "${{ github.ref }}" == "$DEFAULT_BRANCH" ]]; then
             echo "SHOULD_DEPLOY=true" >> $GITHUB_OUTPUT
             echo "IS_STAGING=true" >> $GITHUB_ENV
             echo "APP_NAME=${{ env.STAGING_APP_NAME }}" >> $GITHUB_ENV