GH-50363: [Release] Fix PHASE_BUILD_MSI step in 07-flightsqlodbc-upload.sh

[amoeba]

Rationale for this change

The PHASE_BUILD_MSI step in 07-flightsqlodbc-upload.sh didn't wait for the right job when I ran it during the 25.0.0 release. It found another job and exited saying the job was completed. See my output in #50363.

What changes are included in this PR?

Changes how the PHASE_BUILD_MSI step works so the exact run ID that was triggered gets captured and then gets passed to the wait step. The wait step then waits for a specific job ID to complete. This PR also includes an enhancement to the existing utils-watch-gh-workflow.sh script to let it take an optional run ID.

Are these changes tested?

Yes.

Are there any user-facing changes?

No.

• GitHub Issue: [Release] 07-flightsqlodbc-upload.sh PHASE_BUILD_MSI doesn't correctly watch workflow run #50363

[Copilot]

Pull request overview

Fixes a release automation race in dev/release/07-flightsqlodbc-upload.sh where the MSI-build phase could “watch” the wrong GitHub Actions run by ensuring the exact workflow run ID is captured and (optionally) passed through to the watcher script.

Changes:

• Add optional run-id support to utils-watch-gh-workflow.sh so callers can watch a specific run.
• Update 07-flightsqlodbc-upload.sh to capture the run URL/ID from gh workflow run and pass it to the watcher.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File	Description
dev/release/utils-watch-gh-workflow.sh	Accepts an optional run ID to watch; adjusts how a run is discovered before invoking gh run watch.
dev/release/07-flightsqlodbc-upload.sh	Captures the triggered workflow run URL/ID and passes it to the watcher during PHASE_BUILD_MSI.

[Copilot]

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

[kou]

How about filtering by --event=workflow_dispatch instead of parsing gh workflow run output?

diff --git a/dev/release/07-flightsqlodbc-upload.sh b/dev/release/07-flightsqlodbc-upload.sh
index c823bc84ae..49f901a64f 100755
--- a/dev/release/07-flightsqlodbc-upload.sh
+++ b/dev/release/07-flightsqlodbc-upload.sh
@@ -143,7 +143,8 @@ if [ "${PHASE_BUILD_MSI}" -gt 0 ]; then
     --field odbc_release_step=true
 
   echo "[5/8] Waiting for workflow to complete. This can take a very long time..."
-  REPOSITORY="${GITHUB_REPOSITORY}" \
+  EVENT="workflow_dispatch" \
+    REPOSITORY="${GITHUB_REPOSITORY}" \
     "${SOURCE_DIR}/utils-watch-gh-workflow.sh" "${tag}" package_odbc.yml
 fi
 
diff --git a/dev/release/utils-watch-gh-workflow.sh b/dev/release/utils-watch-gh-workflow.sh
index 163f30251f..83c66d91e9 100755
--- a/dev/release/utils-watch-gh-workflow.sh
+++ b/dev/release/utils-watch-gh-workflow.sh
@@ -29,6 +29,7 @@ fi
 TAG=$1
 WORKFLOW=$2
 : "${REPOSITORY:=${GITHUB_REPOSITORY:-apache/arrow}}"
+: "${EVENT:=push}"
 
 echo "Looking for GitHub Actions workflow on ${REPOSITORY}:${TAG}"
 RUN_ID=""
@@ -36,6 +37,7 @@ while true; do
   echo "Waiting for run to start..."
   RUN_ID=$(gh run list \
               --branch "${TAG}" \
+              --event "${EVENT}" \
               --jq '.[].databaseId' \
               --json databaseId \
               --limit 1 \