diff --git a/.circleci/config.yml b/.circleci/config.yml index ee1c1ae03..9db871006 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -158,7 +158,7 @@ commands: name: "Install Rust" command: | set -x - curl https://sh.rustup.rs | sh -s -- --default-toolchain 1.43.1 -y + curl https://sh.rustup.rs | sh -s -- --default-toolchain 1.44.1 -y source $HOME/.cargo/env rustup component add rustfmt rustup target add wasm32-wasi diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml index 8f4e79dc0..ba5be36fc 100644 --- a/.github/workflows/mac-ci.yml +++ b/.github/workflows/mac-ci.yml @@ -12,7 +12,7 @@ jobs: - name: Install Rust (macos) run: | - curl https://sh.rustup.rs | sh -s -- -y + curl https://sh.rustup.rs | sh -s -- --default-toolchain 1.44.1 -y rustup update echo "##[add-path]$HOME/.cargo/bin" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88a6bae26..f3caab60b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,9 +108,7 @@ jobs: with: submodules: 'recursive' - name: Install Rust (rustup) - run: | - rustup update - rustup component add rustfmt + run: rustup update - run: cargo install cargo-audit - run: cargo audit diff --git a/Dockerfile b/Dockerfile index f880965e8..7d3d55829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm ENV LD_LIBRARY_PATH=/usr/local/lib # Install our supported version of Rust, rustfmt, and the wasm32-wasi cross-compilation target -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.43.1 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.44.1 -y ENV PATH=/root/.cargo/bin:$PATH RUN rustup component add rustfmt RUN rustup target add wasm32-wasi diff --git a/helpers/indent.sh b/helpers/indent.sh index 4fd6d1658..e60d5d859 100755 --- a/helpers/indent.sh +++ b/helpers/indent.sh @@ -10,7 +10,7 @@ cleanup() { } trap cleanup 1 2 3 6 15 -RUSTFMT_VERSION=1.4.12-stable +RUSTFMT_VERSION=1.4.16-stable if ! rustfmt --version | grep -q "rustfmt $RUSTFMT_VERSION"; then echo "indent requires rustfmt $RUSTFMT_VERSION" diff --git a/rust-toolchain b/rust-toolchain index 3987c4729..d724e4390 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.43.1 +1.44.1