Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helpers/indent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.43.1
1.44.1