From b5a6da3d17d7c7bba80be3ed316356fd30b3ed16 Mon Sep 17 00:00:00 2001 From: Michael Klein Date: Mon, 6 Jan 2025 15:19:19 -0500 Subject: [PATCH] Bump MSRV to --- avm-transpiler/rust-toolchain.toml | 2 +- bootstrap.sh | 6 +++--- build-images/Earthfile | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/avm-transpiler/rust-toolchain.toml b/avm-transpiler/rust-toolchain.toml index 77b50d3cfe14..4329c5358c90 100644 --- a/avm-transpiler/rust-toolchain.toml +++ b/avm-transpiler/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.74.1" +channel = "1.75.0" components = ["rust-src"] targets = [] profile = "default" diff --git a/bootstrap.sh b/bootstrap.sh index e0e4a070cd21..14776fd61b48 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -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. diff --git a/build-images/Earthfile b/build-images/Earthfile index ba9b7058abe3..0514482b324d 100644 --- a/build-images/Earthfile +++ b/build-images/Earthfile @@ -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 @@ -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 \ No newline at end of file + BUILD +end-to-end-base