Update rust version in CI

CosmWasm · Oct 11, 2023 · 25bcf61 · 25bcf61
1 parent b79fd26
commit 25bcf61
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   # All checks on the codebase that can run in parallel to build_shared_library
   libwasmvm_sanity:
     docker:
-      - image: cimg/rust:1.67.0
+      - image: cimg/rust:1.70.0
     steps:
       - checkout
       - run:
@@ -18,8 +18,8 @@ jobs:
           command: rustup component add clippy rustfmt
       - restore_cache:
           keys:
-            - cargocache-v3-libwasmvm_sanity-rust:1.67.0-{{ checksum "libwasmvm/Cargo.lock" }}
-            - cargocache-v3-libwasmvm_sanity-rust:1.67.0-
+            - cargocache-v3-libwasmvm_sanity-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
+            - cargocache-v3-libwasmvm_sanity-rust:1.70.0-
       - run:
           name: Ensure libwasmvm/bindings.h is up-to-date
           working_directory: libwasmvm
@@ -66,7 +66,7 @@ jobs:
             - libwasmvm/target/release/.fingerprint
             - libwasmvm/target/release/build
             - libwasmvm/target/release/deps
-          key: cargocache-v3-libwasmvm_sanity-rust:1.67.0-{{ checksum "libwasmvm/Cargo.lock" }}
+          key: cargocache-v3-libwasmvm_sanity-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
 
   # This performs all the Rust debug builds on Windows. Similar to libwasmvm_sanity
   # but avoids duplicating things that are not platform dependent.
@@ -84,15 +84,15 @@ jobs:
           command: |
             set -o errexit
             curl -sS --output rustup-init.exe https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
-            ./rustup-init.exe --no-modify-path --profile minimal --default-toolchain 1.67.0 -y
+            ./rustup-init.exe --no-modify-path --profile minimal --default-toolchain 1.70.0 -y
             echo 'export PATH="$PATH;$USERPROFILE/.cargo/bin"' >> "$BASH_ENV"
       - run:
           name: Show Rust version information
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cachev4-libwasmvm_sanity_windows-rust:1.67.0-{{ checksum "libwasmvm/Cargo.lock" }}
-            - cachev4-libwasmvm_sanity_windows-rust:1.67.0-
+            - cachev4-libwasmvm_sanity_windows-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
+            - cachev4-libwasmvm_sanity_windows-rust:1.70.0-
       - run:
           name: Run unit tests
           working_directory: libwasmvm
@@ -104,7 +104,7 @@ jobs:
             - libwasmvm/target/debug/.fingerprint
             - libwasmvm/target/debug/build
             - libwasmvm/target/debug/deps
-          key: cachev4-libwasmvm_sanity_windows-rust:1.67.0-{{ checksum "libwasmvm/Cargo.lock" }}
+          key: cachev4-libwasmvm_sanity_windows-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
 
   libwasmvm_audit:
     docker:
@@ -219,16 +219,16 @@ jobs:
 
   build_shared_library:
     docker:
-      - image: cimg/rust:1.67.0
+      - image: cimg/rust:1.70.0
     steps:
       - checkout
       - run:
           name: Show version information
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v3-build_shared_library-rust:1.67.0-{{ checksum "libwasmvm/Cargo.lock" }}
-            - cargocache-v3-build_shared_library-rust:1.67.0-
+            - cargocache-v3-build_shared_library-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
+            - cargocache-v3-build_shared_library-rust:1.70.0-
       - run:
           name: Create release build of libwasmvm
           command: make build-rust
@@ -245,7 +245,7 @@ jobs:
             - libwasmvm/target/release/.fingerprint
             - libwasmvm/target/release/build
             - libwasmvm/target/release/deps
-          key: cargocache-v3-build_shared_library-rust:1.67.0-{{ checksum "libwasmvm/Cargo.lock" }}
+          key: cargocache-v3-build_shared_library-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
 
   # Test the Go project
   wasmvm_test:

diff --git a/builders/Dockerfile.alpine b/builders/Dockerfile.alpine
@@ -7,18 +7,18 @@
 FROM golang:1.19.7-alpine
 
 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
 
 # this comes from standard alpine nightly file
 #  https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
 # with some changes to support our toolchain, etc
 RUN set -eux \
-    && apk add --no-cache ca-certificates build-base
+  && apk add --no-cache ca-certificates build-base
 
 RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init" \
   && chmod +x rustup-init \
-  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.69.0 \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.70.0 \
   && rm rustup-init \
   && chmod -R a+w $RUSTUP_HOME $CARGO_HOME
 

diff --git a/builders/Dockerfile.centos7 b/builders/Dockerfile.centos7
@@ -21,12 +21,12 @@ RUN yum -y update \
 
 # 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 "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.69.0 \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.70.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,10 +1,10 @@
-FROM rust:1.69.0-bullseye
+FROM rust:1.70.0-bullseye
 
 # Install build dependencies
 RUN apt-get update \
   && apt install -y clang gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev build-essential cmake \
-    # Support for Windows cross-compile
-    mingw-w64
+  # Support for Windows cross-compile
+  mingw-w64
 
 ## ADD MACOS SUPPORT
 

diff --git a/builders/README.md b/builders/README.md
@@ -14,6 +14,10 @@ any machine that can run Docker can do the cross-compilation.
 
 ## Changelog
 
+**Version 0017:**
+
+- Update Rust to 1.70.0.
+
 **Version 0016:**
 
 - Update Rust to 1.69.0.

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.69.0       | Builders version 0016             |
-| Min Rust compiler        | 1.67.0       | Supports builder versions >= 0015 |
-| Tooling Rust compiler    | 1.69.0       |                                   |
+| Production Rust compiler | 1.70.0       | Builders version 0017             |
+| Min Rust compiler        | 1.70.0       | Supports builder versions >= 0017 |
+| Tooling Rust compiler    | 1.70.0       |                                   |