Skip to content

Commit

Permalink
Rust 1.74
Browse files Browse the repository at this point in the history
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
paritytech/polkadot-sdk#2217
  • Loading branch information
kayabaNerve authored and davidjohnbell committed Nov 20, 2023
1 parent ebd8e0b commit 3540252
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/actions/build-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily-deny.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orchestration/Dockerfile.parts/Dockerfile.serai.build
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion orchestration/coordinator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orchestration/message-queue/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orchestration/processor/bitcoin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orchestration/processor/monero/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orchestration/runtime/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion orchestration/serai/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[toolchain]
channel = "1.74"
targets = ["wasm32-unknown-unknown"]
profile = "minimal"
components = ["rust-src", "rustfmt", "clippy"]

0 comments on commit 3540252

Please sign in to comment.