From cd76f154b0fc8a1d666e6e108129d2b9388a16e2 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Tue, 7 Oct 2025 14:50:27 -0700 Subject: [PATCH] bad --- .github/workflows/macos-setup.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/macos-setup.sh b/.github/workflows/macos-setup.sh index 523c825664..4eb5f25fde 100644 --- a/.github/workflows/macos-setup.sh +++ b/.github/workflows/macos-setup.sh @@ -1,6 +1,19 @@ SOURCE_DIR=$PWD source .github/buildomat/versions.sh +# Pin cmake to <4.0. This is staving off the eventual need to either patch, +# update, or remove GEOS. https://github.com/oxidecomputer/cockroach/issues/18 +# +# Method loosely based on https://github.com/actions/runner-images/pull/12791 +brew uninstall cmake +cmake_commit="b4e46db74e74a8c1650b38b1da222284ce1ec5ce" +tap_name="local/pinned" +brew tap-new --no-git "$tap_name" >/dev/null +cmake_formula_dir="$(brew --repo "$tap_name")/Formula" +mkdir -p "$cmake_formula_dir" +curl -fsSL "https://raw.githubusercontent.com/Homebrew/homebrew-core/$cmake_commit/Formula/c/cmake.rb" -o "$cmake_formula_dir/cmake.rb" +brew install "$tap_name/cmake" + brew install autoconf coreutils make mkdir "$HOME/toolchain"