From f81bdc4218b363517f1446ed07d89d21c9316b61 Mon Sep 17 00:00:00 2001
From: Nat Dean-Lewis <nat.dean-lewis@softwire.com>
Date: Wed, 11 Mar 2026 17:02:12 +0000
Subject: [PATCH] Revert "CLDC-4236: use correct sha ref for review apps"

This reverts commit 36918740f40f7901d5ec194baf49be63fee41f97.
---
 .github/workflows/aws_deploy.yml      | 15 +++------------
 .github/workflows/review_pipeline.yml | 16 +++-------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/aws_deploy.yml b/.github/workflows/aws_deploy.yml
index 9bd78ea3e..0e82e576b 100644
--- a/.github/workflows/aws_deploy.yml
+++ b/.github/workflows/aws_deploy.yml
@@ -22,10 +22,6 @@ on:
       release_tag:
         required: false
         type: string
-      ref:
-        required: false
-        type: string
-        default: ""
 
 concurrency:
   group: deploy-${{ inputs.environment }}${{ inputs.concurrency_tag }}
@@ -46,8 +42,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref || github.sha }}
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -59,19 +53,16 @@ jobs:
         id: ecr-login
         uses: aws-actions/amazon-ecr-login@v2
 
-      - name: Resolve commit SHA
-        run: echo "commit_sha=${{ inputs.ref || github.sha }}" >> $GITHUB_ENV
-
       - name: Check if image with tag already exists
         run: |
-          echo "image-exists=$(if aws ecr describe-images --repository-name=$repository --image-ids imageTag=${{ env.commit_sha }} > /dev/null 2>&1; then echo true; else echo false; fi)" >> $GITHUB_ENV
+          echo "image-exists=$(if aws ecr describe-images --repository-name=$repository --image-ids imageTag=${{ github.sha }} > /dev/null 2>&1; then echo true; else echo false; fi)" >> $GITHUB_ENV
 
       - name: Build, tag, and push docker image to ECR if there is no image, failing for releases
         id: build-image
         if: ${{ env.image-exists == 'false' }}
         env:
           registry: ${{ steps.ecr-login.outputs.registry }}
-          commit_tag: ${{ env.commit_sha }}
+          commit_tag: ${{ github.sha }}
         run: |
           if [[ ${{ inputs.environment }} == 'production' ]]; then
             echo "Error: Deployment to production environment is not allowed as there is no docker image (i.e. the AWS deploy on staging was unsuccessful for this commit)."
@@ -109,7 +100,7 @@ jobs:
         id: update-image-tags
         env:
           registry: ${{ steps.ecr-login.outputs.registry }}
-          commit_tag: ${{ inputs.ref || github.sha }}
+          commit_tag: ${{ github.sha }}
           readable_tag: ${{ inputs.environment }}-${{ env.additional-tag }}
         run: |
           manifest=$(aws ecr batch-get-image --repository-name $repository --image-ids imageTag=$commit_tag --output text --query images[].imageManifest)
diff --git a/.github/workflows/review_pipeline.yml b/.github/workflows/review_pipeline.yml
index 5c89d91e3..307aa0381 100644
--- a/.github/workflows/review_pipeline.yml
+++ b/.github/workflows/review_pipeline.yml
@@ -19,26 +19,17 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       pr_number: ${{ steps.get_pr_details.outputs.pr_number }}
-      pr_head_sha: ${{ steps.get_pr_details.outputs.pr_head_sha }}
     steps:
-      - name: Get PR number and HEAD SHA
+      - name: Get PR number
         id: get_pr_details
         uses: actions/github-script@v7
         with:
           script: |
-            let prNumber;
             if (context.eventName === 'workflow_dispatch') {
-              prNumber = '${{ inputs.pr_number }}';
+              core.setOutput('pr_number', '${{ inputs.pr_number }}');
             } else {
-              prNumber = context.issue.number.toString();
+              core.setOutput('pr_number', context.issue.number.toString());
             }
-            core.setOutput('pr_number', prNumber);
-            const { data: pr } = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: parseInt(prNumber),
-            });
-            core.setOutput('pr_head_sha', pr.head.sha);
 
   infra:
     name: Deploy review app infrastructure
@@ -60,7 +51,6 @@ jobs:
       aws_task_prefix: core-review-${{ needs.get_pr_details.outputs.pr_number }}
       concurrency_tag: ${{ needs.get_pr_details.outputs.pr_number }}
       environment: review
-      ref: ${{ needs.get_pr_details.outputs.pr_head_sha }}
     permissions:
       id-token: write