fixes

Author: justin808

.github/actions/build-docker-image/action.yml

@@ -19,18 +19,11 @@ runs:
       id: build
       shell: bash
       run: |
-        # Redirect build output to a log file to keep Actions log clean
-        LOG_FILE=$(mktemp)
-        echo "🏗️ Building Docker image for commit ${{ inputs.commit }}... (detailed logs will be shown at the end if there's an error)"
+        echo "🏗️ Building Docker image for commit ${{ inputs.commit }}..."
         
-        if cpflow build-image -a ${{ inputs.app_name }} --commit=${{ inputs.commit }} --org=${{ inputs.org }} > "$LOG_FILE" 2>&1; then
+        if cpflow build-image -a ${{ inputs.app_name }} --commit=${{ inputs.commit }} --org=${{ inputs.org }}; then
           echo "✅ Docker image build successful for commit ${{ inputs.commit }}"
         else
-          BUILD_EXIT_CODE=$?
           echo "❌ Docker image build failed for commit ${{ inputs.commit }}"
-          echo "==== Build Logs ===="
-          cat "$LOG_FILE"
-          rm -f "$LOG_FILE"
-          exit $BUILD_EXIT_CODE
+          exit 1
         fi
-        rm -f "$LOG_FILE"

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

@@ -39,8 +39,10 @@ jobs:
         if: github.event_name == 'issue_comment'
         id: getRef
         run: |
-          echo "PR_REF=$(gh pr view $PR_NUMBER --repo ${{ github.repository }} --json headRefName | jq -r '.headRefName')" >> $GITHUB_OUTPUT
-          echo "PR_SHA=$(gh pr view $PR_NUMBER --repo ${{ github.repository }} --json headRefOid | jq -r '.headRefOid')" >> $GITHUB_OUTPUT
+          # For PR comments, get the actual PR head commit
+          PR_DATA=$(gh pr view $PR_NUMBER --repo ${{ github.repository }} --json headRefName,headRefOid)
+          echo "PR_REF=$(echo "$PR_DATA" | jq -r '.headRefName')" >> $GITHUB_OUTPUT
+          echo "PR_SHA=$(echo "$PR_DATA" | jq -r '.headRefOid')" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -56,7 +58,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ steps.getRef.outputs.PR_REF || github.ref }}
+          # For PR events: use the head SHA
+          # For PR comments: use the PR head SHA
+          # For other events: use the push SHA
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || steps.getRef.outputs.PR_SHA || github.sha }}
 
       - name: Setup Environment
         uses: ./.github/actions/setup-environment
@@ -158,7 +163,8 @@ jobs:
         with:
           app_name: ${{ env.APP_NAME }}
           org: ${{ env.CPLN_ORG }}
-          commit: ${{ github.event.comment.body && steps.getRef.outputs.PR_SHA || github.sha }}
+          # Use the same commit resolution as checkout
+          commit: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || steps.getRef.outputs.PR_SHA || github.sha }}
 
       - name: Deploy to Control Plane
         if: steps.determine_action.outputs.action == 'deploy'
@@ -181,7 +187,6 @@ jobs:
             const workflowUrl = result.workflowUrl;
             const railsUrl = '${{ steps.deploy.outputs.rails_url }}';
             const prNumber = process.env.PR_NUMBER;
-            const commitSha = '${{ github.event.comment.body && steps.getRef.outputs.PR_SHA || github.sha }}';
             
             // Update deployment status
             const deploymentStatus = {
@@ -196,40 +201,28 @@ jobs:
               deploymentStatus.environment_url = railsUrl;
             }
             
-            try {
-              await github.rest.repos.createDeploymentStatus(deploymentStatus);
-            } catch (error) {
-              console.error('Failed to update deployment status:', error);
-              throw error;
-            }
+            await github.rest.repos.createDeploymentStatus(deploymentStatus);
             
             // Update the initial comment
             const successMessage = [
-              '🚀 Rails App Deployed to Control Plane for Commit ' + commitSha.substring(0, 7),
+              '✅ Deployment successful for PR #' + prNumber,
               '',
-              '🌐 Rails App: [' + railsUrl + '](' + railsUrl + ')',
+              '🚀 [Deployed Review App](' + railsUrl + ')',
               '',
-              '⚡ [Control Plane Console for Review App](https://console.cpln.io/console/org/' + process.env.CPLN_ORG + '/gvc/' + process.env.APP_NAME + '/workload)',
+              '⚡ [Control Plane Console](https://console.cpln.io/console/org/' + process.env.CPLN_ORG + '/gvc/' + process.env.APP_NAME + '/workload)',
               '',
               '[View Workflow Status](' + workflowUrl + ')'
             ].join('\n');
             
             const failureMessage = [
-              '❌ Deployment failed for PR ' + prNumber,
-              '',
-              'Commit: ' + commitSha.substring(0, 7),
+              '❌ Deployment failed for PR #' + prNumber,
               '',
               '[View Workflow Status](' + workflowUrl + ')'
             ].join('\n');
             
-            try {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: commentId,
-                body: isSuccess ? successMessage : failureMessage
-              });
-            } catch (error) {
-              console.error('Failed to update comment:', error);
-              throw error;
-            }
+            await github.rest.issues.updateComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: commentId,
+              body: isSuccess ? successMessage : failureMessage
+            });