Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: complete updates to build-images from msrv bump #12320

Merged
merged 3 commits into from
Feb 28, 2025
+11 −5
Merged

chore: complete updates to build-images from msrv bump #12320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c910d2
chore: complete updates to build-images from msrv bump
TomAFrench Feb 27, 2025
77fdb4a
chore: read rust version from toolchain file
TomAFrench Feb 27, 2025
8262e8d
chore: warn on missing rust version
TomAFrench Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,20 @@ function check_toolchains {
echo "Installation: sudo apt install clang-16"
exit 1
fi
# Check rust version.
if ! rustup show | grep "1.75" > /dev/null; then
# Check rustup installed.
local rust_version=$(yq '.toolchain.channel' ./noir/noir-repo/rust-toolchain.toml)
if ! command -v rustup > /dev/null; then
encourage_dev_container
echo "Rust version 1.75 not installed."
echo "Rustup not installed."
echo "Installation:"
echo " curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.85.0"
echo " curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $rust_version"
exit 1
fi
if ! rustup show | grep $rust_version > /dev/null; then
# Cargo will download necessary version of rust at runtime but warn to alert that an update to the build-image
# is desirable.
echo -e "${bold}${yellow}WARN: Rust ${rust_version} is not installed. Performance will be degraded.${reset}"
fi
# Check wasi-sdk version.
if ! cat /opt/wasi-sdk/VERSION 2> /dev/null | grep 22.0 > /dev/null; then
encourage_dev_container
Expand Down
2 changes: 1 addition & 1 deletion build-images/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ ENV RUSTUP_HOME=/opt/rust/rustup
ENV CARGO_HOME=/opt/rust/cargo
ENV PATH="/opt/rust/cargo/bin:$PATH"
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.85.0 && \
rustup target add wasm32-unknown-unknown wasm32-wasi aarch64-apple-darwin && \
rustup target add wasm32-unknown-unknown wasm32-wasip1 aarch64-apple-darwin && \
chmod -R a+w /opt/rust

# Install corepack and yarn.
Expand Down
Loading