ci: Use push trigger for version tracker and fix job conditions

Switch update-tracker from pull_request:closed to push trigger on
deps/jni-0.15.x so it fires on any merge (PR or direct push) and
correctly uses the merge commit SHA. Guard sync job with explicit
event_name == 'release' check to prevent it running on push events.

Refs GH-3373
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: buenaflor

.github/workflows/sync-jni-branch.yml

@@ -3,6 +3,9 @@ name: Sync JNI Branch
 on:
   release:
     types: [published]
+  push:
+    branches:
+      - deps/jni-0.15.x
 
 env:
   JNI_BRANCH: deps/jni-0.15.x
@@ -20,7 +23,9 @@ jobs:
   sync:
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    if: ${{ !github.event.release.prerelease }}
+    if: >-
+      github.event_name == 'release' &&
+      !github.event.release.prerelease
 
     steps:
       - name: Get auth token
@@ -110,42 +115,6 @@ jobs:
             --title "Sync JNI branch with release $TAG" \
             --body-file /tmp/pr-body.md
 
-      - name: Update version tracker on issue
-        if: steps.regenerate.outcome == 'success'
-        env:
-          GH_TOKEN: ${{ steps.token.outputs.token }}
-          TAG: ${{ steps.release.outputs.tag }}
-        run: |
-          COMMIT_SHA="$(git rev-parse HEAD)"
-          SHORT_SHA="$(git rev-parse --short HEAD)"
-          REPO="${{ github.repository }}"
-          DATE="$(date -u +%Y-%m-%d)"
-          NEW_ROW="| \`$TAG\` | [\`$SHORT_SHA\`](https://github.com/$REPO/commit/$COMMIT_SHA) | $DATE |"
-
-          # Fetch current issue body
-          gh issue view 3373 --json body --jq .body > /tmp/issue-body.txt
-
-          # Check if the version tracking table already exists
-          if grep -q "<!-- jni-version-tracker -->" /tmp/issue-body.txt; then
-            # Insert new row after the table header separator (|---|---|---|)
-            # Use awk to avoid sed escaping issues with pipes and backticks
-            awk -v row="$NEW_ROW" '/^\|[-[:space:]|]+\|$/ && found { print; print row; found=0; next } /<!-- jni-version-tracker -->/ { found=1 } { print }' /tmp/issue-body.txt > /tmp/issue-body-updated.txt
-          else
-            # Append a new table to the issue body
-            cp /tmp/issue-body.txt /tmp/issue-body-updated.txt
-            {
-              echo ""
-              echo "<!-- jni-version-tracker -->"
-              echo "## Version Tracking"
-              echo ""
-              echo "| Version | Commit | Date |"
-              echo "|---------|--------|------|"
-              echo "$NEW_ROW"
-            } >> /tmp/issue-body-updated.txt
-          fi
-
-          gh issue edit 3373 --body-file /tmp/issue-body-updated.txt
-
       - name: Create issue on failure
         if: steps.regenerate.outcome == 'failure'
         env:
@@ -177,3 +146,72 @@ jobs:
           gh issue create \
             --title "JNI branch sync failed for release $TAG" \
             --body-file /tmp/issue-body.md
+
+  update-tracker:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          fetch-depth: 10
+
+      - name: Extract version from merge commit
+        id: version
+        run: |
+          # Look for "Merge release X.Y.Z" in recent commit messages
+          TAG="$(git log --oneline -10 --grep='Merge release' | head -1 | sed -n 's/.*Merge release \([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')"
+          if [ -z "$TAG" ]; then
+            echo "No release merge commit found in recent history, skipping tracker update"
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "tag=$TAG" >> $GITHUB_OUTPUT
+            echo "skip=false" >> $GITHUB_OUTPUT
+            echo "Found version: $TAG"
+          fi
+
+      - name: Get auth token
+        if: steps.version.outputs.skip != 'true'
+        id: token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
+          private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
+
+      - name: Update version tracker on issue
+        if: steps.version.outputs.skip != 'true'
+        env:
+          GH_TOKEN: ${{ steps.token.outputs.token }}
+          TAG: ${{ steps.version.outputs.tag }}
+        run: |
+          COMMIT_SHA="${{ github.sha }}"
+          SHORT_SHA="${COMMIT_SHA:0:7}"
+          REPO="${{ github.repository }}"
+          DATE="$(date -u +%Y-%m-%d)"
+          NEW_ROW="| \`$TAG\` | [\`$SHORT_SHA\`](https://github.com/$REPO/commit/$COMMIT_SHA) | $DATE |"
+
+          # Fetch current issue body
+          gh issue view 3373 --repo "$REPO" --json body --jq .body > /tmp/issue-body.txt
+
+          # Check if the version tracking table already exists
+          if grep -q "<!-- jni-version-tracker -->" /tmp/issue-body.txt; then
+            # Insert new row after the table header separator (|---|---|---|)
+            awk -v row="$NEW_ROW" \
+              '/^\|[-[:space:]|]+\|$/ && found { print; print row; found=0; next }
+               /<!-- jni-version-tracker -->/ { found=1 }
+               { print }' /tmp/issue-body.txt > /tmp/issue-body-updated.txt
+          else
+            # Append a new table to the issue body
+            cp /tmp/issue-body.txt /tmp/issue-body-updated.txt
+            {
+              echo ""
+              echo "<!-- jni-version-tracker -->"
+              echo "## Version Tracking"
+              echo ""
+              echo "| Version | Commit | Date |"
+              echo "|---------|--------|------|"
+              echo "$NEW_ROW"
+            } >> /tmp/issue-body-updated.txt
+          fi
+
+          gh issue edit 3373 --repo "$REPO" --body-file /tmp/issue-body-updated.txt