Skip to content

Commit 3073d83

Browse files
authored
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)
2 parents 7ec34c7 + c7ba0f4 commit 3073d83

7 files changed

+13
-8
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: all build build-rust build-go test
22

33
# Builds the Rust library libwasmvm
4-
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0018
4+
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0019
55
# Contains a full Go dev environment including CGO support in order to run Go tests on the built shared library
66
# This image is currently not published.
77
ALPINE_TESTER := cosmwasm/alpine-tester:local

builders/Dockerfile.alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.73.0-alpine
1+
FROM rust:1.77.0-alpine
22

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

builders/Dockerfile.centos7

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
2626

2727
RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \
2828
&& chmod +x rustup-init \
29-
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.73.0 \
29+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.77.0 \
3030
&& rm rustup-init \
3131
&& chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
3232
&& rustup --version \

builders/Dockerfile.cross

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.73.0-bullseye
1+
FROM rust:1.77.0-bullseye
22

33
# Install build dependencies
44
RUN apt-get update \
@@ -26,7 +26,7 @@ RUN git clone https://github.com/tpoechtrager/osxcross \
2626
# Don't change file name when downloading because osxcross auto-detects the version from the name
2727
&& wget -nc https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz \
2828
&& mv MacOSX11.3.sdk.tar.xz tarballs/ \
29-
&& UNATTENDED=yes OSX_VERSION_MIN=10.10 ./build.sh \
29+
&& UNATTENDED=yes OSX_VERSION_MIN=10.15 ./build.sh \
3030
# Cleanups before Docker layer is finalized
3131
&& rm -r tarballs/
3232
RUN chmod +rx /opt/osxcross

builders/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Versioned by a simple counter that is not bound to a specific CosmWasm version
22
# See builders/README.md
3-
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0018
3+
BUILDERS_PREFIX := cosmwasm/go-ext-builder:0019
44

55
.PHONY: docker-image-centos7
66
docker-image-centos7:

builders/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ versions of the builder images.
2121

2222
**Unreleased**
2323

24+
**Version 0019:**
25+
26+
- Bump `OSX_VERSION_MIN` to 10.15.
27+
- Update Rust to 1.77.0.
28+
2429
**Version 0018:**
2530

2631
- Remove Go dev environment from `cosmwasm/go-ext-builder:XXXX-alpine`

docs/COMPILER_VERSIONS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ We currently use the following version:
6363

6464
| Type | Rust version | Note |
6565
| ------------------------ | ------------ | --------------------------------- |
66-
| Production Rust compiler | 1.73.0 | Builders version 0017 |
67-
| Min Rust compiler | 1.70.0 | Supports builder versions >= 0017 |
66+
| Production Rust compiler | 1.77.0 | Builders version 0019 |
67+
| Min Rust compiler | 1.73.0 | Supports builder versions >= 0017 |
6868
| Tooling Rust compiler | 1.75.0 | |

0 commit comments

Comments
 (0)