From 3b6a73845ed5bbd6be12e36b113127db589196f0 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Mon, 22 Jul 2024 21:18:08 -0400 Subject: [PATCH] chore(ci): Reinstall rustup in MacOS bootstrap (#20911) * chore(ci): Install rustup in MacOS bootstrap The package was renamed from rustup-init to rustup which seems to be causing some issues in CI. Signed-off-by: Jesse Szwedko * Ensure rustup in PATH Signed-off-by: Jesse Szwedko * debug Signed-off-by: Jesse Szwedko * Reinstall rustup Signed-off-by: Jesse Szwedko * Actually reinstall Signed-off-by: Jesse Szwedko * Remove pr trigger Signed-off-by: Jesse Szwedko --------- Signed-off-by: Jesse Szwedko --- scripts/environment/bootstrap-macos-10.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/environment/bootstrap-macos-10.sh b/scripts/environment/bootstrap-macos-10.sh index 7da53ee0a3563..64f5c375f7dcf 100755 --- a/scripts/environment/bootstrap-macos-10.sh +++ b/scripts/environment/bootstrap-macos-10.sh @@ -12,6 +12,12 @@ brew list -1 | grep python | while read -r formula; do brew unlink "$formula"; b brew install ruby@3 coreutils cue-lang/tap/cue protobuf +# rustup-init (renamed to rustup) is already installed in GHA, but seems to be lacking the rustup binary +# Reinstalling seems to fix it +# TODO(jszwedko): It's possible GHA just needs to update its images and this won't be needed in the +# future +brew reinstall rustup + gem install bundler echo "export PATH=\"/usr/local/opt/ruby/bin:\$PATH\"" >> "$HOME/.bash_profile"