Skip to content

Commit

Permalink
chore(ci): Reinstall rustup in MacOS bootstrap (#20911)
Browse files Browse the repository at this point in the history
* 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 <jesse.szwedko@datadoghq.com>

* Ensure rustup in PATH

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* debug

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Reinstall rustup

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Actually reinstall

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

* Remove pr trigger

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>

---------

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
  • Loading branch information
jszwedko authored Jul 23, 2024
1 parent 67a5e46 commit 3b6a738
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions scripts/environment/bootstrap-macos-10.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 3b6a738

Please sign in to comment.