chore: add fixes to homebrew in build.sh

Author: jinseopkim0

ci/kokoro/macos/build.sh

@@ -21,15 +21,31 @@ echo "================================================================"
 echo "== EXECUTING SCRIPT FROM 'preview-kokoro-fix' BRANCH =="
 echo "================================================================"
 
-# TEMPORARY WORKAROUND for corrupted homebrew taps in Kokoro images.
-echo "==> Cleaning up Homebrew taps"
-brew untap homebrew/cask --force || true
-brew untap homebrew/cask-versions --force || true
-brew untap homebrew/core --force || true
-
-# Perform a fresh update
-echo "==> Updating Homebrew"
-brew update -v
+# ===== START HOMEBREW FIXES =====
+io::log_h2 "Attempting to fix Homebrew environment"
+
+# Check initial state
+io::log_h2 "DEBUG: Brew version before any fixes"
+brew --version || echo "brew version failed"
+io::log_h2 "DEBUG: Brew doctor before any fixes"
+brew doctor || echo "brew doctor failed"
+
+# Fix the git origin for Homebrew itself
+io::log_h2 "DEBUG: Setting Homebrew git origin"
+git -C "/usr/local/Homebrew" remote set-url origin https://github.com/Homebrew/brew || echo "Failed to set Homebrew origin, continuing..."
+
+# Forcefully reset Homebrew to clean up any corruption
+io::log_h2 "DEBUG: Running brew update-reset"
+brew update-reset
+
+# Check state after reset
+io::log_h2 "DEBUG: Brew version after update-reset"
+brew --version || echo "brew version failed"
+io::log_h2 "DEBUG: Brew doctor after update-reset"
+brew doctor || echo "brew doctor failed"
+
+io::log_h2 "DEBUG: Homebrew environment fixes complete"
+# ===== END HOMEBREW FIXES =====
 
 source "$(dirname "$0")/../../lib/init.sh"
 source module ci/lib/io.sh

ci/kokoro/macos/builds/cmake-vcpkg.sh

@@ -34,15 +34,6 @@ brew --version
 io::log_h2 "DEBUG: Brew doctor before update"
 brew doctor
 
-# TEMPORARY WORKAROUND for outdated homebrew in Kokoro images.
-echo "==> Forcefully resetting Homebrew"
-brew update-reset
-
-io::log_h2 "DEBUG: Brew version after update-reset"
-brew --version
-io::log_h2 "DEBUG: Brew doctor after update-reset"
-brew doctor
-
 # Install bash and ninja
 io::log_h2 "DEBUG: Before brew install bash ninja"
 brew install bash ninja