Merge pull request #19872 from mozilla/fix-create-version-sha

fix(deploy): Incorrect hash used across multiple tags

Author: vpomerleau

.github/workflows/docker.yml

@@ -78,6 +78,16 @@ jobs:
         with:
           ref: ${{ env.GIT_TAG }}
 
+      - name: Verify tag checkout and commit
+        shell: bash
+        run: |
+          set -euo pipefail
+          echo "GIT_TAG=${GIT_TAG}"
+          echo "GITHUB_SHA=${GITHUB_SHA}"
+          echo "Checked out HEAD=$(git rev-parse HEAD)"
+          git describe --tags --exact-match | grep -Fx "$GIT_TAG"
+          git show -s --format='%H %D' HEAD
+
       - uses: actions/setup-node@v6
         with:
           cache: yarn
@@ -88,6 +98,16 @@ jobs:
 
       - run: ./_scripts/create-version-json.sh
 
+      - name: Show generated version.json (sanity check)
+        shell: bash
+        run: |
+          set -euo pipefail
+          echo "packages/version.json:"
+          cat ./packages/version.json
+          echo
+          echo "apps/version.json:"
+          cat ./apps/version.json
+
       - uses: docker/setup-buildx-action@v3
 
       - id: meta

_scripts/create-version-json.sh

@@ -12,7 +12,7 @@ if [[ "${CIRCLECI}" == "true" ]]; then
     | tee "$DIR/../packages/version.json" "$DIR/../apps/version.json"
 elif [[ "${GITHUB_ACTIONS}" == "true" ]]; then
   printf '{"version":{"hash":"%s","version":"%s","source":"https://github.com/%s","build":"%s/%s/actions/runs/%s"}}\n' \
-    "${GITHUB_SHA}" \
+    "$(git rev-parse HEAD)" \
     "${GIT_TAG}" \
     "${GITHUB_REPOSITORY}" \
     "${GITHUB_SERVER_URL}" \