Skip to content

Commit

Permalink
Bump MSRV to
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeljklein committed Jan 6, 2025
1 parent cf559ae commit b5a6da3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion avm-transpiler/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.74.1"
channel = "1.75.0"
components = ["rust-src"]
targets = []
profile = "default"
6 changes: 3 additions & 3 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ function check_toolchains {
exit 1
fi
# Check rust version.
if ! rustup show | grep "1.74" > /dev/null; then
if ! rustup show | grep "1.75" > /dev/null; then
encourage_dev_container
echo "Rust version 1.74 not installed."
echo "Rust version 1.75 not installed."
echo "Installation:"
echo " curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.74.1"
echo " curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0"
exit 1
fi
# Check wasi-sdk version.
Expand Down
6 changes: 3 additions & 3 deletions build-images/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,14 @@ build:
COPY +foundry/opt/foundry /opt/foundry
ENV PATH="/opt/foundry/bin:$PATH"

# Install rust and cross-compilers. Noir specifically uses 1.74.1.
# Install rust and cross-compilers. Noir specifically uses 1.75.0.
# We remove base-build's rust first.
# We give everyone write ownership so downstream boxes can write.
ENV RUSTUP_HOME=/opt/rust/rustup
ENV CARGO_HOME=/opt/rust/cargo
ENV PATH="/opt/rust/cargo/bin:$PATH"
RUN apt remove -y cargo rustc
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.74.1 && \
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0 && \
rustup target add wasm32-unknown-unknown wasm32-wasi aarch64-apple-darwin && \
chmod -R a+w /opt/rust

Expand Down Expand Up @@ -508,4 +508,4 @@ all-ci:
# TODO(#10677): this needs to be pushed while also updating our CI AMI
# BUILD +ci
BUILD +aztec-base
BUILD +end-to-end-base
BUILD +end-to-end-base

0 comments on commit b5a6da3

Please sign in to comment.