From 85a32991152871b06becd6b411eb663008369769 Mon Sep 17 00:00:00 2001
From: Jarred Sumner <jarred@jarredsumner.com>
Date: Wed, 14 Aug 2024 02:09:30 -0700
Subject: [PATCH] CI fixes

---
 .buildkite/scripts/build-cpp.sh | 6 ++++--
 scripts/update-submodules.sh    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.buildkite/scripts/build-cpp.sh b/.buildkite/scripts/build-cpp.sh
index 4112227fe5509..f1a973580b973 100755
--- a/.buildkite/scripts/build-cpp.sh
+++ b/.buildkite/scripts/build-cpp.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
 set -eo pipefail
-source "$(dirname "$0")/env.sh"
 export FORCE_UPDATE_SUBMODULES=1
-source "$(realpath $(dirname "$0")/../../scripts/update-submodules.sh)"
+
+# env.sh calls update_submodules.sh
+source "$(dirname "$0")/env.sh"
+
 { set +x; } 2>/dev/null
 
 function run_command() {
diff --git a/scripts/update-submodules.sh b/scripts/update-submodules.sh
index ca428c5f46ada..f43388f5290ef 100755
--- a/scripts/update-submodules.sh
+++ b/scripts/update-submodules.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
- FORCE_UPDATE_SUBMODULES=${FORCE_UPDATE_SUBMODULES:-0}
+FORCE_UPDATE_SUBMODULES=${FORCE_UPDATE_SUBMODULES:-0}
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 cd ..