From 47ec67e944b72ffd7f23eafebe08327b04be04f1 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 27 Mar 2024 15:01:18 +0100 Subject: [PATCH 1/3] Bump OSX_VERSION_MIN to 10.15 and Rust to 1.77.0 --- Makefile | 2 +- builders/Dockerfile.alpine | 2 +- builders/Dockerfile.centos7 | 2 +- builders/Dockerfile.cross | 4 ++-- builders/Makefile | 2 +- builders/README.md | 3 +++ docs/COMPILER_VERSIONS.md | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 03b4d0843..4461b0a76 100644 --- a/Makefile +++ b/Makefile @@ -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-dev # 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 diff --git a/builders/Dockerfile.alpine b/builders/Dockerfile.alpine index 003b54ee1..ec276a232 100644 --- a/builders/Dockerfile.alpine +++ b/builders/Dockerfile.alpine @@ -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 diff --git a/builders/Dockerfile.centos7 b/builders/Dockerfile.centos7 index a60036708..d1505a155 100644 --- a/builders/Dockerfile.centos7 +++ b/builders/Dockerfile.centos7 @@ -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 \ diff --git a/builders/Dockerfile.cross b/builders/Dockerfile.cross index 61c8a43af..e4a31b40a 100644 --- a/builders/Dockerfile.cross +++ b/builders/Dockerfile.cross @@ -1,4 +1,4 @@ -FROM rust:1.73.0-bullseye +FROM rust:1.77.0-bullseye # Install build dependencies RUN apt-get update \ @@ -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 diff --git a/builders/Makefile b/builders/Makefile index fcff04c80..7067a2b9c 100644 --- a/builders/Makefile +++ b/builders/Makefile @@ -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-dev .PHONY: docker-image-centos7 docker-image-centos7: diff --git a/builders/README.md b/builders/README.md index 651b576f1..cf96364e0 100644 --- a/builders/README.md +++ b/builders/README.md @@ -21,6 +21,9 @@ versions of the builder images. **Unreleased** +- 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` diff --git a/docs/COMPILER_VERSIONS.md b/docs/COMPILER_VERSIONS.md index 380906ead..70defa4a7 100644 --- a/docs/COMPILER_VERSIONS.md +++ b/docs/COMPILER_VERSIONS.md @@ -63,6 +63,6 @@ We currently use the following version: | Type | Rust version | Note | | ------------------------ | ------------ | --------------------------------- | -| Production Rust compiler | 1.73.0 | Builders version 0017 | +| Production Rust compiler | 1.77.0 | Builders version 0019 | | Min Rust compiler | 1.70.0 | Supports builder versions >= 0017 | | Tooling Rust compiler | 1.75.0 | | From 20f70defe3d0c34ae14cbc718f6a3a42c8f64845 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 3 Apr 2024 13:41:43 +0200 Subject: [PATCH 2/3] Set builders version 0019 --- Makefile | 2 +- builders/Makefile | 2 +- builders/README.md | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4461b0a76..fe23364fb 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all build build-rust build-go test # Builds the Rust library libwasmvm -BUILDERS_PREFIX := cosmwasm/go-ext-builder:0019-dev +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 diff --git a/builders/Makefile b/builders/Makefile index 7067a2b9c..8fe3c5166 100644 --- a/builders/Makefile +++ b/builders/Makefile @@ -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:0019-dev +BUILDERS_PREFIX := cosmwasm/go-ext-builder:0019 .PHONY: docker-image-centos7 docker-image-centos7: diff --git a/builders/README.md b/builders/README.md index cf96364e0..eaa714f7d 100644 --- a/builders/README.md +++ b/builders/README.md @@ -21,6 +21,8 @@ versions of the builder images. **Unreleased** +**Version 0019:** + - Bump `OSX_VERSION_MIN` to 10.15. - Update Rust to 1.77.0. From c7ba0f4e7244314d61c4b8b8ba9754953aea703c Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 3 Apr 2024 14:32:49 +0200 Subject: [PATCH 3/3] Fix Min Rust compiler docs (builders 0017 means Rust 1.73.0) --- docs/COMPILER_VERSIONS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/COMPILER_VERSIONS.md b/docs/COMPILER_VERSIONS.md index 70defa4a7..80818f91e 100644 --- a/docs/COMPILER_VERSIONS.md +++ b/docs/COMPILER_VERSIONS.md @@ -64,5 +64,5 @@ We currently use the following version: | Type | Rust version | Note | | ------------------------ | ------------ | --------------------------------- | | Production Rust compiler | 1.77.0 | Builders version 0019 | -| Min Rust compiler | 1.70.0 | Supports builder versions >= 0017 | +| Min Rust compiler | 1.73.0 | Supports builder versions >= 0017 | | Tooling Rust compiler | 1.75.0 | |