From 98a40dbcf7d4264df41944af9ad6ffcd82831898 Mon Sep 17 00:00:00 2001 From: thedevbirb Date: Fri, 4 Oct 2024 14:44:07 +0200 Subject: [PATCH] chore: pin rustc version everywhere, just fmt with set nightly formatter --- Justfile | 7 +++++++ bolt-boost/Dockerfile | 2 +- bolt-boost/rust-toolchain.toml | 3 +++ bolt-client/rust-toolchain.toml | 3 +++ bolt-kurtosis-client/rust-toolchain.toml | 3 +++ bolt-sidecar/Dockerfile | 2 +- bolt-sidecar/rust-toolchain.toml | 3 +++ 7 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 bolt-boost/rust-toolchain.toml create mode 100644 bolt-client/rust-toolchain.toml create mode 100644 bolt-kurtosis-client/rust-toolchain.toml create mode 100644 bolt-sidecar/rust-toolchain.toml diff --git a/Justfile b/Justfile index 4202ab981..13e822355 100644 --- a/Justfile +++ b/Justfile @@ -2,6 +2,13 @@ default: @just --list --unsorted +# 1. Make sure the nightly-2024-10-03 toolchain is installed +# 2. cd to git root and cd into crate +fmt crate: + rustup toolchain install nightly-2024-10-03 > /dev/null 2>&1 && \ + cd $(git rev-parse --show-toplevel)/{{crate}} && \ + cargo +nightly-2024-10-03 fmt + # run the web demo locally demo: chmod +x ./scripts/start-demo.sh diff --git a/bolt-boost/Dockerfile b/bolt-boost/Dockerfile index a14e95611..9590e4c10 100644 --- a/bolt-boost/Dockerfile +++ b/bolt-boost/Dockerfile @@ -1,4 +1,4 @@ -FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef +FROM lukemathwalker/cargo-chef:latest-rust-1.81.0-alpine AS chef WORKDIR /app FROM chef AS planner diff --git a/bolt-boost/rust-toolchain.toml b/bolt-boost/rust-toolchain.toml new file mode 100644 index 000000000..bbf217f21 --- /dev/null +++ b/bolt-boost/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.81.0" +profile = "default" diff --git a/bolt-client/rust-toolchain.toml b/bolt-client/rust-toolchain.toml new file mode 100644 index 000000000..bbf217f21 --- /dev/null +++ b/bolt-client/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.81.0" +profile = "default" diff --git a/bolt-kurtosis-client/rust-toolchain.toml b/bolt-kurtosis-client/rust-toolchain.toml new file mode 100644 index 000000000..bbf217f21 --- /dev/null +++ b/bolt-kurtosis-client/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.81.0" +profile = "default" diff --git a/bolt-sidecar/Dockerfile b/bolt-sidecar/Dockerfile index 7eb73069e..5b2075b99 100644 --- a/bolt-sidecar/Dockerfile +++ b/bolt-sidecar/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:slim-bullseye AS compiler +FROM rust:1.81.0-slim-bullseye AS compiler RUN cargo install cargo-chef diff --git a/bolt-sidecar/rust-toolchain.toml b/bolt-sidecar/rust-toolchain.toml new file mode 100644 index 000000000..bbf217f21 --- /dev/null +++ b/bolt-sidecar/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.81.0" +profile = "default"