From 9c8584763a619b2c9f4b4f78275095fac0bb4b4a Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Mon, 19 Oct 2026 11:45:36 -0700 Subject: [PATCH 1/2] macmini pull submodules without error --- scripts/shared-macmini/build-and-test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/shared-macmini/build-and-test.sh b/scripts/shared-macmini/build-and-test.sh index f94a665bbd..e3939a5a07 100755 --- a/scripts/shared-macmini/build-and-test.sh +++ b/scripts/shared-macmini/build-and-test.sh @@ -3,7 +3,7 @@ # Build and test Smith on team's shared MacMini, then report results to a set of emails # Immediately fail upon error and update environment -set -e +set -eE source ~/.bash_profile # Variables @@ -36,8 +36,11 @@ print_run_log cd $PROJECT_DIR # Update repo print_run_log git checkout develop -print_run_log git pull +print_run_log git fetch --all --tags --prune +print_run_log git submodule sync --recursive print_run_log git submodule update --init --recursive +print_run_log git submodule foreach --recursive 'git fetch --all --tags --prune' +print_run_log git pull --recurse-submodules # Clear previous build(s) print_run_log rm -rf _smith_build_and_test* From 191a7c7194617373608e8346b9fe82a4e8461a68 Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Tue, 20 Oct 2026 15:59:10 -0700 Subject: [PATCH 2/2] deinit --- scripts/shared-macmini/build-and-test.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/shared-macmini/build-and-test.sh b/scripts/shared-macmini/build-and-test.sh index e3939a5a07..3765d2d834 100755 --- a/scripts/shared-macmini/build-and-test.sh +++ b/scripts/shared-macmini/build-and-test.sh @@ -36,10 +36,7 @@ print_run_log cd $PROJECT_DIR # Update repo print_run_log git checkout develop -print_run_log git fetch --all --tags --prune -print_run_log git submodule sync --recursive -print_run_log git submodule update --init --recursive -print_run_log git submodule foreach --recursive 'git fetch --all --tags --prune' +print_run_log git deinit --force --all print_run_log git pull --recurse-submodules # Clear previous build(s)