From 6895eb7ef6f857cbd1be4d5255a4ae7247039e55 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 3 Jan 2022 17:39:15 -0800
Subject: [PATCH] Correctly set CI_COMMIT when Buildkite provides HEAD instead
 of a real commit

---
 ci/env.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/env.sh b/ci/env.sh
index 10305ee1a..8d1902e06 100644
--- a/ci/env.sh
+++ b/ci/env.sh
@@ -23,6 +23,9 @@ if [[ -n $CI ]]; then
   elif [[ -n $BUILDKITE ]]; then
     export CI_BRANCH=$BUILDKITE_BRANCH
     export CI_BUILD_ID=$BUILDKITE_BUILD_ID
+    if [[ $BUILDKITE_COMMIT = HEAD ]]; then
+      BUILDKITE_COMMIT="$(git rev-parse HEAD)"
+    fi
     export CI_COMMIT=$BUILDKITE_COMMIT
     export CI_JOB_ID=$BUILDKITE_JOB_ID
     # The standard BUILDKITE_PULL_REQUEST environment variable is always "false" due