Fix logic of github_api to autodetect host (#127)

* Fix logic of github_api to autodetect host * Add CHANGELOG entry
Automattic · Sep 19, 2024 · c4e9a60 · c4e9a60
1 parent ed6ecaa
commit c4e9a60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,7 @@ _None._
 ### Bug Fixes
 
 - Fix not working SARIF upload on non-PR branches [#124]
+- Fix logic in our `github_api` helper to auto-detecting the GitHub host [#127]
 
 ### Internal Changes
 

diff --git a/bin/github_api b/bin/github_api
@@ -4,7 +4,7 @@
 #
 # ENVIRONMENT VARIABLES:
 #   GITHUB_TOKEN: Required. The GitHub token to use for authentication.
-#   GH_HOST: Optional. The GitHub host to use. We'll figure out the host from `BUILDKITE_*` env vars if not set.
+#   GH_HOST: Optional. The GitHub host to use. We'll figure out the host from `BUILDKITE_REPO` env var if not set.
 #
 # Usage:
 #   github_api <endpoint> [curl-options]
@@ -23,8 +23,8 @@ shift
 
 github_host=${GH_HOST:-}
 if [[ -z "${github_host}" ]]; then
-    if [[ -n "${BUILDKITE_PULL_REQUEST_REPO:-}" ]]; then
-        github_host=$(echo "$BUILDKITE_PULL_REQUEST_REPO" | awk -F[/:] '{print $4}')
+    if [[ "${BUILDKITE_REPO:-}" =~ ^(https?://|git@)([^/:]+)[:/] ]]; then
+        github_host="${BASH_REMATCH[2]}"
     else
         github_host=github.com
     fi