Merge pull request #529 from CosmWasm/higher-OSX_VERSION_MIN

Bump OSX_VERSION_MIN to 10.15 and Rust to 1.77.0 (builders 0019)
CosmWasm · Apr 3, 2024 · 3073d83 · 3073d83
2 parents 7ec34c7 + c7ba0f4
commit 3073d83
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git 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
 # 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
@@ -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
@@ -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
@@ -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
@@ -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:

diff --git a/builders/README.md b/builders/README.md
@@ -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`

diff --git 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             |
-| 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       |                                   |