From e0ff953c44e5b7023d60f59cf8bc18cb109c4e50 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Thu, 28 Nov 2024 11:24:50 +0100 Subject: [PATCH] Change minimum Rust toolchain to 1.83 --- .drone.yml | 4 ++-- .github/workflows/ci.yaml | 10 +++++----- Dockerfile | 2 +- README.md | 4 ++-- docker/producer-dashboard/Dockerfile | 6 +++--- node/testing/docker/Dockerfile.openmina | 2 +- node/testing/docker/Dockerfile.test | 2 +- run.yaml | 4 ++-- tools/bootstrap-sandbox/Dockerfile | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index df3e313fc7..d66e3de853 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,10 +53,10 @@ steps: - cp /usr/local/bin/mina cli/bin/ - name: build - image: rust:1.80-bullseye + image: rust:1.83-bullseye commands: - apt-get update && apt-get install -y libssl-dev libjemalloc-dev jq protobuf-compiler - - rustup update 1.80 && rustup default 1.80 + - rustup update 1.83 && rustup default 1.83 - rustup component add rustfmt # just to be sure it builds without errors - cargo build diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 66de4f6b6c..d9c6beff07 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -74,7 +74,7 @@ jobs: - name: Setup Rust run: | - rustup default 1.80 + rustup default 1.83 rustup component add rustfmt - name: Setup Rust Cache @@ -100,7 +100,7 @@ jobs: - name: Setup Rust run: | - rustup default 1.80 + rustup default 1.83 rustup component add rustfmt - name: Setup Rust Cache @@ -160,7 +160,7 @@ jobs: - name: Setup Rust run: | - rustup default 1.80 + rustup default 1.83 rustup component add rustfmt - name: Setup Rust Cache @@ -196,7 +196,7 @@ jobs: - name: Setup Rust run: | - rustup default 1.80 + rustup default 1.83 rustup component add rustfmt - name: Setup Rust Cache @@ -351,7 +351,7 @@ jobs: with: pattern: tests* merge-multiple: true - + - name: Download tests uses: actions/download-artifact@v4 with: diff --git a/Dockerfile b/Dockerfile index 441ca69069..fb375a0697 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM rust:buster AS build RUN apt-get update && apt-get install -y protobuf-compiler && apt-get clean -RUN rustup default 1.80 && rustup component add rustfmt +RUN rustup default 1.83 && rustup component add rustfmt WORKDIR /openmina COPY . . RUN cargo build --release --package=cli --bin=openmina diff --git a/README.md b/README.md index 3635ad7220..c587857151 100644 --- a/README.md +++ b/README.md @@ -155,8 +155,8 @@ Open up the command line and enter the following: And then: ```sh -# Install rustup and set the default Rust toolchain to 1.80 (newer versions work too) -curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.80 +# Install rustup and set the default Rust toolchain to 1.83 (newer versions work too) +curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.83 # Setup the current shell with rustup source "$HOME/.cargo/env" # Clone the openmina repository diff --git a/docker/producer-dashboard/Dockerfile b/docker/producer-dashboard/Dockerfile index e9970ff97e..c6ae4a58f0 100644 --- a/docker/producer-dashboard/Dockerfile +++ b/docker/producer-dashboard/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.80 AS app-builder +FROM rust:1.83 AS app-builder WORKDIR /usr/src/openmina-producer-dashboard @@ -77,10 +77,10 @@ RUN eval $(opam config env) && make build_all_sigs FROM ubuntu:latest RUN apt-get update && apt-get install -y libpq5 libjemalloc2 - + COPY --from=app-builder /usr/local/cargo/bin/openmina-producer-dashboard /usr/local/bin/openmina-producer-dashboard COPY --from=mina-builder /go/mina/src/app/libp2p_helper/result/bin/libp2p_helper /usr/local/bin/coda-libp2p_helper COPY --from=mina-builder /go/mina/_build/default/src/app/cli/src/mina_testnet_signatures.exe /usr/local/bin/mina # TODO: replace -ENTRYPOINT [ "openmina-producer-dashboard" ] \ No newline at end of file +ENTRYPOINT [ "openmina-producer-dashboard" ] diff --git a/node/testing/docker/Dockerfile.openmina b/node/testing/docker/Dockerfile.openmina index 2dcc6d531d..18250403c8 100644 --- a/node/testing/docker/Dockerfile.openmina +++ b/node/testing/docker/Dockerfile.openmina @@ -9,7 +9,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN rm /bin/sh && ln -s /bin/bash /bin/sh -RUN source ~/.cargo/env && rustup update 1.80 +RUN source ~/.cargo/env && rustup update 1.83 RUN git clone https://github.com/openmina/openmina diff --git a/node/testing/docker/Dockerfile.test b/node/testing/docker/Dockerfile.test index 9207a02f5c..8227afd053 100644 --- a/node/testing/docker/Dockerfile.test +++ b/node/testing/docker/Dockerfile.test @@ -2,7 +2,7 @@ FROM vladsimplestakingcom/mina-openmina-builder:focal AS builder RUN git fetch && git checkout feat/tests-with-debugger -RUN source ~/.cargo/env && cargo +1.80 build --release -p openmina-node-testing --bin runner --bin openmina-node-testing +RUN source ~/.cargo/env && cargo +1.83 build --release -p openmina-node-testing --bin runner --bin openmina-node-testing FROM vladsimplestakingcom/mina-debugger:2.0.0rampup4-focal diff --git a/run.yaml b/run.yaml index b1792a7e54..bc69691964 100644 --- a/run.yaml +++ b/run.yaml @@ -72,11 +72,11 @@ spec: - | apt-get update && apt-get -y install git curl gcc libssl-dev pkg-config curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - PATH=$PATH:~/.cargo/bin && rustup update 1.80 + PATH=$PATH:~/.cargo/bin && rustup update 1.83 git clone https://github.com/openmina/openmina cd openmina git fetch && git checkout feat/tweak-for-debugger - PATH=$PATH:~/.cargo/bin && cargo +1.80 build --release --bin openmina -p cli --no-default-features + PATH=$PATH:~/.cargo/bin && cargo +1.83 build --release --bin openmina -p cli --no-default-features cp target/release/openmina /usr/local/bin/openmina openmina node -p 10000 --libp2p-port 8302 ports: diff --git a/tools/bootstrap-sandbox/Dockerfile b/tools/bootstrap-sandbox/Dockerfile index 3f07f0be8c..7ab38d3a52 100644 --- a/tools/bootstrap-sandbox/Dockerfile +++ b/tools/bootstrap-sandbox/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.80.0-bullseye AS builder +FROM rust:1.83.0-bullseye AS builder RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts