From 340e6eccfffbf3f88126ef3f05e8895bb054cc4c Mon Sep 17 00:00:00 2001
From: William Woodruff <william@yossarian.net>
Date: Wed, 8 May 2024 12:12:21 -0400
Subject: [PATCH] publish-commit-bottles: relocate head_sha output

Signed-off-by: William Woodruff <william@yossarian.net>
---
 .github/workflows/publish-commit-bottles.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-commit-bottles.yml b/.github/workflows/publish-commit-bottles.yml
index ebf4044b4f4f4..348e9bf2fadcd 100644
--- a/.github/workflows/publish-commit-bottles.yml
+++ b/.github/workflows/publish-commit-bottles.yml
@@ -331,8 +331,6 @@ jobs:
             ${{inputs.message && '--message="$INPUT_MESSAGE"' || ''}} \
             "$PR"
 
-          echo "head_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-
       - name: Generate build provenance
         uses: actions/attest-build-provenance@v1
         with:
@@ -356,6 +354,8 @@ jobs:
             ${{inputs.warn_on_upload_failure && '--warn-on-upload-failure' || ''}} \
             "$PR"
 
+          echo "head_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+
       - name: Push commits
         uses: Homebrew/actions/git-try-push@master
         with:
@@ -389,7 +389,7 @@ jobs:
         id: wait-until-in-sync
         working-directory: ${{steps.set-up-homebrew.outputs.repository-path}}
         env:
-          EXPECTED_SHA: ${{steps.pr-pull.outputs.head_sha}}
+          EXPECTED_SHA: ${{steps.pr-upload.outputs.head_sha}}
         run: |
           echo "::notice ::Local repository HEAD: $EXPECTED_SHA"
 
@@ -429,7 +429,7 @@ jobs:
         id: automerge
         env:
           GH_TOKEN: ${{secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN}}
-          EXPECTED_SHA: ${{steps.pr-pull.outputs.head_sha}}
+          EXPECTED_SHA: ${{steps.pr-upload.outputs.head_sha}}
         working-directory: ${{steps.set-up-homebrew.outputs.repository-path}}
         run: |
           local_git_head="$(git rev-parse HEAD)"