Skip to content

Commit

Permalink
No longer install rust on the jenkins-worker machines. (#130)
Browse files Browse the repository at this point in the history
## Summary:
fastly-ka-dev is gone, we don't need to run rust code anymore!

Issue: none

## Test plan:
none

Subscribers: @MiguelCastillo

Author: csilvers

Reviewers: kevinb-khan

Required Reviewers:

Approved By: kevinb-khan

Checks:

Pull Request URL: #130
  • Loading branch information
csilvers authored Nov 22, 2024
1 parent 376719d commit b28f0ae
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 37 deletions.
14 changes: 0 additions & 14 deletions bin/install-mac-rust.py

This file was deleted.

3 changes: 0 additions & 3 deletions bin/system_report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ header "Go"
tool_version go version
kv_multiline "Go ENV" "$(go env)"

header "Rust"
tool_version cargo --version

# This is multi-line, but it's still pretty readable. Good enough for now.
header "Fastly"
tool_version fastly version
Expand Down
5 changes: 0 additions & 5 deletions containers/kabuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,4 @@ RUN cat bashrc.default .bashrc > .bashrc.new
RUN mv .bashrc.new .bashrc
RUN rm -f bashrc.default

RUN mkdir -p /tmp/rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs --output /tmp/rust/rustup-init.sh
RUN bash /tmp/rust/rustup-init.sh -y --profile default --no-modify-path
RUN rm -rf /tmp/rust

CMD tail -f /dev/null
14 changes: 0 additions & 14 deletions linux-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -301,19 +301,6 @@ install_postgresql() {
sudo service postgresql restart
}

install_rust() {
builddir=$(mktemp -d -t rustup.XXXXX)

(
cd "$builddir"
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs --output rustup-init.sh
bash rustup-init.sh -y --profile default --no-modify-path
)

# cleanup temporary build directory
sudo rm -rf "$builddir"
}

install_fastly() {
builddir=$(mktemp -d -t fastly.XXXXX)

Expand Down Expand Up @@ -370,7 +357,6 @@ install_watchman
setup_clock
config_inotify
install_postgresql
install_rust
install_fastly
# TODO (boris): Setup pyenv (see mac_setup:install_python_tools)
# https://opencafe.readthedocs.io/en/latest/getting_started/pyenv/
Expand Down
1 change: 0 additions & 1 deletion mac-setup-normal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ update_git
install_node
install_go

"$DEVTOOLS_DIR"/khan-dotfiles/bin/install-mac-rust.py
"$DEVTOOLS_DIR"/khan-dotfiles/bin/mac-setup-postgres.py

install_redis
Expand Down

0 comments on commit b28f0ae

Please sign in to comment.