Skip to content

Bump OSX_VERSION_MIN to 10.15 and Rust to 1.77.0 (builders 0019) #529

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.

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

Merged
merged 3 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: all build build-rust build-go test

# Builds the Rust library libwasmvm
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0018
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0019
# Contains a full Go dev environment including CGO support in order to run Go tests on the built shared library
# This image is currently not published.
ALPINE_TESTER := cosmwasm/alpine-tester:local
Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.73.0-alpine
FROM rust:1.77.0-alpine

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

Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \

RUN wget "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.73.0 \
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.77.0 \
&& rm rustup-init \
&& chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
&& rustup --version \
Expand Down
4 changes: 2 additions & 2 deletions builders/Dockerfile.cross
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.73.0-bullseye
FROM rust:1.77.0-bullseye

# Install build dependencies
RUN apt-get update \
Expand Down Expand Up @@ -26,7 +26,7 @@ RUN git clone https://github.com/tpoechtrager/osxcross \
# Don't change file name when downloading because osxcross auto-detects the version from the name
&& wget -nc https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz \
&& mv MacOSX11.3.sdk.tar.xz tarballs/ \
&& UNATTENDED=yes OSX_VERSION_MIN=10.10 ./build.sh \
&& UNATTENDED=yes OSX_VERSION_MIN=10.15 ./build.sh \
# Cleanups before Docker layer is finalized
&& rm -r tarballs/
RUN chmod +rx /opt/osxcross
Expand Down
2 changes: 1 addition & 1 deletion builders/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Versioned by a simple counter that is not bound to a specific CosmWasm version
# See builders/README.md
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0018
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0019

.PHONY: docker-image-centos7
docker-image-centos7:
Expand Down
5 changes: 5 additions & 0 deletions builders/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ versions of the builder images.

**Unreleased**

**Version 0019:**

- Bump `OSX_VERSION_MIN` to 10.15.
- Update Rust to 1.77.0.

**Version 0018:**

- Remove Go dev environment from `cosmwasm/go-ext-builder:XXXX-alpine`
Expand Down
4 changes: 2 additions & 2 deletions docs/COMPILER_VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ We currently use the following version:

| Type | Rust version | Note |
| ------------------------ | ------------ | --------------------------------- |
| Production Rust compiler | 1.73.0 | Builders version 0017 |
| Min Rust compiler | 1.70.0 | Supports builder versions >= 0017 |
| Production Rust compiler | 1.77.0 | Builders version 0019 |
| Min Rust compiler | 1.73.0 | Supports builder versions >= 0017 |
| Tooling Rust compiler | 1.75.0 | |
Loading