From f88608ccf64945a69a6612966474d90dc8840599 Mon Sep 17 00:00:00 2001
From: Joe Doss <jdoss@users.noreply.github.com>
Date: Fri, 11 Dec 2020 15:31:52 -0600
Subject: [PATCH] Rework the PULL_REQUEST_ID logic (#11869)

---
 scripts/create_buildkite_pr_build.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/create_buildkite_pr_build.sh b/scripts/create_buildkite_pr_build.sh
index d6e32ba2e..810a54b54 100755
--- a/scripts/create_buildkite_pr_build.sh
+++ b/scripts/create_buildkite_pr_build.sh
@@ -28,11 +28,11 @@ if [[ -z "$GITHUB_TOKEN" ]]; then
 fi
 
 # Get the pull request ID
-PULL_REQUEST_ID=$(jq -r ".pull_request.number" "$GITHUB_EVENT_PATH")
-if [[ "${PULL_REQUEST_ID}" == "null" ]]; then
-  PULL_REQUEST_ID=$(jq -r ".event.issue.number" "${GITHUB_EVENT_PATH}")
-fi
-if [[ "${PULL_REQUEST_ID}" == "null" ]]; then
+PULL_REQUEST_ID=${{ github.event.issue.number }}
+
+if [[ -z "${PULL_REQUEST_ID}" || "${PULL_REQUEST_ID}" == "null" ]]; then
+  PULL_REQUEST_ID=${{ github.event.number }}
+elif [[ -z "${PULL_REQUEST_ID}" || "${PULL_REQUEST_ID}" == "null" ]]; then
   echo "Failed to determine PR Number."
   exit 1
 fi