fixes

Author: justin808

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

@@ -106,24 +106,36 @@ jobs:
         run: |
           if ! cpflow exists -a ${{ env.APP_NAME }}; then
             echo "No review app exists for this PR"
-            exit 0
+            echo "app_exists=false" >> $GITHUB_OUTPUT
+            if [[ "${{ github.event_name }}" == "push" ]]; then
+              exit 0
+            fi
           fi
           echo "app_exists=true" >> $GITHUB_OUTPUT
 
       - name: Validate Deployment Request
         id: validate
         run: |
-          if [[ "${{ github.event_name }}" == "pull_request" && "${{ steps.check-app.outputs.app_exists }}" == "true" ]] || \
-             [[ "${{ github.event_name }}" == "workflow_dispatch" ]] || \
-             [[ "${{ github.event_name }}" == "issue_comment" && "${{ github.event.comment.body }}" == "/deploy-review-app" ]] || \
-             [[ "${{ github.event_name }}" == "push" ]]; then
-            echo "SHOULD_DEPLOY=true" >> $GITHUB_ENV
-          else
-            echo "SHOULD_DEPLOY=false" >> $GITHUB_ENV
+          if ! [[ "${{ github.event_name }}" == "workflow_dispatch" || \
+                 ("${{ github.event_name }}" == "issue_comment" && "${{ github.event.comment.body }}" == "/deploy-review-app") || \
+                 "${{ github.event_name }}" == "push" ]]; then
             echo "Skipping deployment - not a valid trigger (event: ${{ github.event_name }})"
             exit 0
           fi
 
+      - name: Create Initial Comment
+        id: create-comment
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const result = await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: process.env.PR_NUMBER,
+              body: '🚀 Starting deployment process...\n\n' + process.env.CONSOLE_LINK
+            });
+            core.setOutput('comment-id', result.data.id);
+
       - name: Set Deployment URLs
         id: set-urls
         uses: actions/github-script@v7
@@ -146,81 +158,6 @@ jobs:
               'https://console.cpln.io/console/org/' + process.env.CPLN_ORG + '/gvc/' + process.env.APP_NAME + '/-info)'
             );
 
-      - name: Create Initial Comment
-        id: create-comment
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const result = await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: process.env.PR_NUMBER,
-              body: '🚀 Deploying Review App...\n\n' + process.env.CONSOLE_LINK
-            });
-            return result.data.id;
-
-      - name: Set Comment ID
-        run: echo "COMMENT_ID=${{ fromJSON(steps.create-comment.outputs.result).commentId }}" >> $GITHUB_ENV
-
-      - name: Initialize Deployment
-        id: init-deployment
-        uses: actions/github-script@v7
-        with:
-          script: |
-            async function getWorkflowUrl(runId) {
-              const jobs = await github.rest.actions.listJobsForWorkflowRun({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                run_id: runId
-              });
-              
-              const currentJob = jobs.data.jobs.find(job => job.status === 'in_progress');
-              const jobId = currentJob?.id;
-              
-              if (!jobId) {
-                console.log('Warning: Could not find current job ID');
-                return `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
-              }
-              
-              return `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}/job/${jobId}`;
-            }
-            
-            // Create initial deployment comment
-            const comment = await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: process.env.PR_NUMBER,
-              body: '⏳ Initializing deployment...'
-            });
-            
-            // Create GitHub deployment
-            const deployment = await github.rest.repos.createDeployment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: context.sha,
-              environment: 'review',
-              auto_merge: false,
-              required_contexts: []
-            });
-
-            const workflowUrl = await getWorkflowUrl(context.runId);
-            
-            return {
-              deploymentId: deployment.data.id,
-              commentId: comment.data.id,
-              workflowUrl
-            };
-
-      - name: Set comment ID and workflow URL
-        run: |
-          echo "COMMENT_ID=${{ fromJSON(steps.init-deployment.outputs.result).commentId }}" >> $GITHUB_ENV
-          echo "WORKFLOW_URL=${{ fromJSON(steps.init-deployment.outputs.result).workflowUrl }}" >> $GITHUB_ENV
-
-      - name: Set commit hash
-        run: |
-          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
         uses: actions/github-script@v7
         with:
@@ -237,7 +174,7 @@ jobs:
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: process.env.COMMENT_ID,
+              comment_id: ${{ steps.create-comment.outputs.comment-id }},
               body: buildingMessage
             });
 
@@ -269,7 +206,7 @@ jobs:
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: process.env.COMMENT_ID,
+              comment_id: ${{ steps.create-comment.outputs.comment-id }},
               body: deployingMessage
             });
 
@@ -329,6 +266,6 @@ jobs:
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: process.env.COMMENT_ID,
+              comment_id: ${{ steps.create-comment.outputs.comment-id }},
               body: isSuccess ? successMessage : failureMessage
             });