From d4089a2985313f97b034e77059687ebf83cfd852 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Mon, 2 Feb 2026 13:43:42 -0600
Subject: [PATCH] fix(ci): pre-emptive tagging (#4415)

---
 .github/workflows/create-or-promote-release.yml | 12 ++++++++----
 .github/workflows/release.yml                   |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/create-or-promote-release.yml b/.github/workflows/create-or-promote-release.yml
index 2597721d8..4144208b1 100644
--- a/.github/workflows/create-or-promote-release.yml
+++ b/.github/workflows/create-or-promote-release.yml
@@ -240,10 +240,14 @@ jobs:
           else
             echo "No changes to commit."
           fi
-          
-          # Pre-emptive Tagging: Tag the commit (new or existing) and push immediately
-          # This ensures downstream workflows can simply checkout the tag.
-          echo "Tagging and pushing $FINAL_TAG..."
+        shell: bash
+
+      - name: Create and Push Release Tag
+        if: ${{ !inputs.dry_run && inputs.channel == 'internal' }}
+        env:
+          FINAL_TAG: ${{ steps.calculate_tags.outputs.final_tag }}
+        run: |
+          echo "Tagging and pushing release: $FINAL_TAG"
           git tag "$FINAL_TAG"
           git push origin "$FINAL_TAG"
         shell: bash
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 890efc1df..6dd7f27d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -111,6 +111,10 @@ jobs:
           echo "versionCode=$VERSION_CODE" >> $GITHUB_OUTPUT
         shell: bash
 
+  release-google:
+    runs-on: ubuntu-latest
+    needs: [prepare-build-info, run-lint]
+    environment: Release
     env:
       GRADLE_OPTS: "-Dorg.gradle.daemon=false"
       GRADLE_CACHE_URL: ${{ secrets.GRADLE_CACHE_URL }}