From 05b975dff9d8fedf98859998cd63fdefa63d0ee1 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Sun, 19 Nov 2023 17:43:43 -0500 Subject: [PATCH] Rust 1.74 Adds a Rust toolchain file to be less disruptive to developers who don't keep their toolchain synchronized (by now having rustup automatically synchronize). Hopefully helps resolve how +nightly clippy may pass for the coordinator, yet building would fail due to stable's (hopefully prior?) failure to model some async functions re: Send/Sync. Also adds rust-src as a component in preparation of https://github.com/paritytech/polkadot-sdk/pull/2217 --- .github/actions/build-dependencies/action.yml | 4 ++-- .github/workflows/daily-deny.yml | 2 +- .github/workflows/lint.yml | 4 ++-- orchestration/Dockerfile.parts/Dockerfile.serai.build | 2 +- orchestration/coordinator/Dockerfile | 2 +- orchestration/message-queue/Dockerfile | 2 +- orchestration/processor/bitcoin/Dockerfile | 2 +- orchestration/processor/monero/Dockerfile | 2 +- orchestration/runtime/Dockerfile | 2 +- orchestration/serai/Dockerfile | 2 +- rust-toolchain.toml | 5 +++++ 11 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 rust-toolchain.toml diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml index 8717be4e..1e5729f2 100644 --- a/.github/actions/build-dependencies/action.yml +++ b/.github/actions/build-dependencies/action.yml @@ -10,12 +10,12 @@ inputs: rust-toolchain: description: "Rust toolchain to install" required: false - default: 1.73.0 + default: 1.74.0 rust-components: description: "Rust components to install" required: false - default: + default: rust-src, clippy runs: using: "composite" diff --git a/.github/workflows/daily-deny.yml b/.github/workflows/daily-deny.yml index 1d102199..5e22ee9c 100644 --- a/.github/workflows/daily-deny.yml +++ b/.github/workflows/daily-deny.yml @@ -20,7 +20,7 @@ jobs: - name: Install cargo uses: dtolnay/rust-toolchain@5cb429dd810e16ff67df78472fa81cf760f4d1c0 with: - toolchain: 1.73.0 + toolchain: 1.74.0 - name: Install cargo deny run: cargo install --locked cargo-deny diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 37a419b3..7808331a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} rust-toolchain: ${{ steps.nightly.outputs.version }} - rust-components: clippy + rust-components: rust-src, clippy - name: Run Clippy run: cargo clippy --all-features --all-targets -- -D warnings -A clippy::items_after_test_module @@ -41,7 +41,7 @@ jobs: - name: Install cargo uses: dtolnay/rust-toolchain@5cb429dd810e16ff67df78472fa81cf760f4d1c0 with: - toolchain: 1.73.0 + toolchain: 1.74.0 - name: Install cargo deny run: cargo install --locked cargo-deny diff --git a/orchestration/Dockerfile.parts/Dockerfile.serai.build b/orchestration/Dockerfile.parts/Dockerfile.serai.build index e6ece7a7..87b65cf2 100644 --- a/orchestration/Dockerfile.parts/Dockerfile.serai.build +++ b/orchestration/Dockerfile.parts/Dockerfile.serai.build @@ -1,4 +1,4 @@ -FROM rust:1.73-slim-bookworm as builder +FROM rust:1.74-slim-bookworm as builder COPY --from=mimalloc libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/orchestration/coordinator/Dockerfile b/orchestration/coordinator/Dockerfile index 4284a4e1..7b874ed6 100644 --- a/orchestration/coordinator/Dockerfile +++ b/orchestration/coordinator/Dockerfile @@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \ cmake -DMI_SECURE=ON ../.. && \ make && \ cp ./libmimalloc-secure.so ../../../libmimalloc.so -FROM rust:1.73-slim-bookworm as builder +FROM rust:1.74-slim-bookworm as builder COPY --from=mimalloc libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/orchestration/message-queue/Dockerfile b/orchestration/message-queue/Dockerfile index 39b0af7a..a35ceaad 100644 --- a/orchestration/message-queue/Dockerfile +++ b/orchestration/message-queue/Dockerfile @@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \ cmake -DMI_SECURE=ON ../.. && \ make && \ cp ./libmimalloc-secure.so ../../../libmimalloc.so -FROM rust:1.73-slim-bookworm as builder +FROM rust:1.74-slim-bookworm as builder COPY --from=mimalloc libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/orchestration/processor/bitcoin/Dockerfile b/orchestration/processor/bitcoin/Dockerfile index 00c87ba6..3446f2f4 100644 --- a/orchestration/processor/bitcoin/Dockerfile +++ b/orchestration/processor/bitcoin/Dockerfile @@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \ cmake -DMI_SECURE=ON ../.. && \ make && \ cp ./libmimalloc-secure.so ../../../libmimalloc.so -FROM rust:1.73-slim-bookworm as builder +FROM rust:1.74-slim-bookworm as builder COPY --from=mimalloc libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/orchestration/processor/monero/Dockerfile b/orchestration/processor/monero/Dockerfile index 985b4d43..21003a1c 100644 --- a/orchestration/processor/monero/Dockerfile +++ b/orchestration/processor/monero/Dockerfile @@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \ cmake -DMI_SECURE=ON ../.. && \ make && \ cp ./libmimalloc-secure.so ../../../libmimalloc.so -FROM rust:1.73-slim-bookworm as builder +FROM rust:1.74-slim-bookworm as builder COPY --from=mimalloc libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/orchestration/runtime/Dockerfile b/orchestration/runtime/Dockerfile index 144c8cac..cbc82552 100644 --- a/orchestration/runtime/Dockerfile +++ b/orchestration/runtime/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.73.0-slim-bookworm as builder +FROM rust:1.74.0-slim-bookworm as builder # Move to a Debian package snapshot RUN rm -rf /etc/apt/sources.list.d/debian.sources && \ diff --git a/orchestration/serai/Dockerfile b/orchestration/serai/Dockerfile index 37caa8a5..883a2227 100644 --- a/orchestration/serai/Dockerfile +++ b/orchestration/serai/Dockerfile @@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \ cmake -DMI_SECURE=ON ../.. && \ make && \ cp ./libmimalloc-secure.so ../../../libmimalloc.so -FROM rust:1.73-slim-bookworm as builder +FROM rust:1.74-slim-bookworm as builder COPY --from=mimalloc libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..ffac6d61 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,5 @@ +[toolchain] +channel = "1.74" +targets = ["wasm32-unknown-unknown"] +profile = "minimal" +components = ["rust-src", "rustfmt", "clippy"]