From 1de3515ced6ba31e1df4298b8101c5035605b78b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 12 Jul 2026 23:47:13 +0000
Subject: [PATCH] Make Nightly tag SHA check robust

---
 .github/workflows/nightly.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5eaa709cb0..2ad693ba80 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -851,12 +851,16 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           git tag -f Nightly "${{ github.sha }}"
-          if ! git push --force-with-lease origin refs/tags/Nightly; then
+          if ! git push --force origin refs/tags/Nightly; then
             echo "Failed to push Nightly tag to origin"
             exit 1
           fi
 
-          TAG_SHA="$(git ls-remote --tags origin refs/tags/Nightly | awk '$2 == "refs/tags/Nightly" { print $1 }')"
+          TAG_SHA="$(git ls-remote --tags origin refs/tags/Nightly refs/tags/Nightly^{} | awk '
+            $2 == "refs/tags/Nightly^{}" { sha = $1 }
+            $2 == "refs/tags/Nightly" && sha == "" { sha = $1 }
+            END { print sha }
+          ')"
           if [ "$TAG_SHA" != "${{ github.sha }}" ]; then
             echo "Nightly tag points to $TAG_SHA, expected ${{ github.sha }}"
             exit 1