Skip to content

Commit

Permalink
Merge pull request #563 from CosmWasm/co/update-rust-builder
Browse files Browse the repository at this point in the history
Update builder to Rust 1.81
  • Loading branch information
chipshort authored Oct 14, 2024
2 parents 65d03d3 + b7c1cbf commit 682a176
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion builders/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 rust:1.80.0-alpine
FROM --platform=linux/amd64 rust:1.81.0-alpine

RUN apk add --no-cache ca-certificates build-base

Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.cross
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 rust:1.80.0-bookworm
FROM --platform=linux/amd64 rust:1.81.0-bookworm

# Install build dependencies
RUN apt-get update \
Expand Down
6 changes: 3 additions & 3 deletions builders/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ RUN apt update -y \

# GET FROM https://github.com/rust-lang/docker-rust-nightly
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH

RUN wget --no-verbose "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \
&& chmod +x rustup-init \
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.80.0 \
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.81.0 \
&& rm rustup-init \
&& chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
&& rustup --version \
Expand Down
4 changes: 2 additions & 2 deletions builders/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Cross Compilation Scripts

As this library is targetting go developers, we cannot assume a properly set up
As this library is targeting go developers, we cannot assume a properly set up
rust environment on their system. Further, when importing this library, there is
no clean way to add a `libwasmvm.{so,dll,dylib}`. It needs to be committed with
the tagged (go) release in order to be easily usable.
Expand All @@ -23,7 +23,7 @@ See those DockerHub repos for all available versions of the builder images.

**Unreleased**

- Update Rust to 1.80.0.
- Update Rust to 1.81.0.
- Update Dockerfile.cross from Debian Bullseye to Bookworm ([#533])
- Rename `.cargo/config` to `.cargo/config.toml` to silence warning

Expand Down

0 comments on commit 682a176

Please sign in to comment.