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

fix(rust): Bump compiler to latest release #363

Merged
merged 5 commits into from
Jan 2, 2025
Merged

fix(rust): Bump compiler to latest release #363

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97c3789
fix(rust): Bump compiler to latest release
stevenj Jan 2, 2025
a2424db
fix comment
stevenj Jan 2, 2025
92c874d
feat(rust): Add wasi-p2 target
stevenj Jan 2, 2025
ea5dac4
fix(rust): Allow using the mithril crate as a git reference, so we ca…
stevenj Jan 2, 2025
52f5ca9
fix(rust): remove obsolete comment
stevenj Jan 2, 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
8 changes: 4 additions & 4 deletions earthly/rust/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rust-base:
# This is our base Host toolset, and rustup.
# Never use `rust-toolchain.toml` in CI as it breaks builds.
# The only toolchain supported is the one installed here.
FROM rust:1.81.0-slim-bookworm
FROM rust:1.83.0-slim-bookworm

WORKDIR /root

Expand Down Expand Up @@ -82,7 +82,7 @@ rust-base:
# Ensure we have all the necessary targets
RUN rustup target add wasm32-unknown-unknown
RUN rustup target add wasm32-wasip1
# RUN rustup target add wasm32-wasip2 # wasm32-wasip2 not yet available in stable - Try again in 1.82
RUN rustup target add wasm32-wasip2 # wasm32-wasip2 not yet available in stable - Try again in 1.82
stevenj marked this conversation as resolved.
Show resolved Hide resolved
RUN rustup target add x86_64-unknown-linux-gnu
RUN rustup target add x86_64-apple-darwin
RUN rustup target add x86_64-pc-windows-gnu
Expand Down Expand Up @@ -365,7 +365,7 @@ REMOVE_SOURCE_FINGERPRINTS:

# TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322
# Installing Rust
# Code reference from [rust1.81.0-slim-bookworm](https://github.com/rust-lang/docker-rust/blob/63f877a36f8ba9d9b4b35cd49df3327264510886/stable/bookworm/slim/Dockerfile)
# Code reference from [rust1.83.0-slim-bookworm](https://github.com/rust-lang/docker-rust/blob/63f877a36f8ba9d9b4b35cd49df3327264510886/stable/bookworm/slim/Dockerfile)
INSTALL_RUST:
FUNCTION

Expand All @@ -374,7 +374,7 @@ INSTALL_RUST:
ENV RUSTUP_HOME=/usr/local/rustup
ENV CARGO_HOME=/usr/local/cargo
ENV PATH=/usr/local/cargo/bin:$PATH
ENV RUST_VERSION=1.81.0
ENV RUST_VERSION=1.83.0

IF [ "$TARGETARCH" = "amd64" ]
LET PLATFORM = "x86_64-unknown-linux-gnu"
Expand Down
1 change: 1 addition & 0 deletions earthly/rust/stdcfgs/deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ allow-git = [
"https://github.com/txpipe/vrf",
"https://github.com/txpipe/kes",
"https://github.com/txpipe/curve25519-dalek",
"https://github.com/input-output-hk/mithril",
]

[licenses]
Expand Down
2 changes: 1 addition & 1 deletion earthly/rust/stdcfgs/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.81"
channel = "1.83"
profile = "default"
1 change: 1 addition & 0 deletions examples/rust/deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ allow-git = [
"https://github.com/txpipe/vrf",
"https://github.com/txpipe/kes",
"https://github.com/txpipe/curve25519-dalek",
"https://github.com/input-output-hk/mithril",
]

[licenses]
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.81"
channel = "1.83"
profile = "default"
Loading