From 85d8b4570c498d269b7931e2720a18912389b8a1 Mon Sep 17 00:00:00 2001 From: Nick Gheorghita Date: Thu, 19 Sep 2024 18:04:08 -0400 Subject: [PATCH] fix: update rustc version in dockerfile and build scripts (#1468) --- .circleci/config.yml | 10 +++++----- Cargo.toml | 2 +- book/src/developers/quick_setup.md | 4 ++-- docker/Dockerfile | 2 +- docker/Dockerfile.bridge | 2 +- utp-testing/docker/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fac36dca3..6501e0148 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ executors: environment: IMAGE_NAME: portalnetwork/trin docker: - - image: cimg/rust:1.80.0 + - image: cimg/rust:1.81.0 docker-nightly: docker: - image: rustlang/rust:nightly @@ -153,7 +153,7 @@ jobs: resource_class: xlarge executor: name: rust/default - tag: 1.80.0 + tag: 1.81.0 environment: RUSTFLAGS: "-D warnings" RUST_LOG: "debug" @@ -174,7 +174,7 @@ jobs: resource_class: xlarge executor: name: rust/default - tag: 1.80.0 + tag: 1.81.0 environment: RUSTFLAGS: "-D warnings" RUST_LOG: "debug" @@ -211,7 +211,7 @@ jobs: resource_class: 2xlarge executor: name: rust/default - tag: 1.80.0 + tag: 1.81.0 environment: RUSTFLAGS: "-D warnings" RUST_LOG: "debug,html5ever=error,selectors=error,discv5::service=info" @@ -228,7 +228,7 @@ jobs: check-workspace-crates: executor: name: rust/default - tag: 1.79.0 + tag: 1.81.0 # parallelism level should be set to the amount of simulators we have or greater # The reason for this is the CI code currently only supports 1 input at a time # if we have a parallelism level of 5 and 6 sims one test runner will get 2 test sims and fail diff --git a/Cargo.toml b/Cargo.toml index e480b6609..fbd61d6d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "trin" version = "0.1.0" authors = ["https://github.com/ethereum/trin/graphs/contributors"] edition = "2021" -rust-version = "1.80.0" +rust-version = "1.81.0" default-run = "trin" repository = "https://github.com/ethereum/trin" license = "GPL-3.0" diff --git a/book/src/developers/quick_setup.md b/book/src/developers/quick_setup.md index c444196e5..7967a91b4 100644 --- a/book/src/developers/quick_setup.md +++ b/book/src/developers/quick_setup.md @@ -83,7 +83,7 @@ rustc --version You should see something like: ```bash -rustc 1.80.0 (051478957 2024-07-21) +rustc 1.81.0 (051478957 2024-07-21) ``` Next, install the required dependencies: @@ -207,4 +207,4 @@ nc -U /tmp/trin-jsonrpc.ipc {"id":86,"jsonrpc":"2.0","result":"enr:-IS4QHK_CnCsQKT-mFTilJ5msHacIJtU91aYe8FhAd_K7G-ACO-FO2GPFOyM7kiphjXMwrNh8Y4mSbN3ufSdBQFzjikBgmlkgnY0gmlwhMCoAMKJc2VjcDI1NmsxoQNa58x56RRRcUeOegry5S4yQvLa6LKlDcbBPHL4H5Oy4oN1ZHCCIyg"} ``` -For something in between, you may use `curl` to send requests to the HTTP JSON-RPC endpoint. \ No newline at end of file +For something in between, you may use `curl` to send requests to the HTTP JSON-RPC endpoint. diff --git a/docker/Dockerfile b/docker/Dockerfile index ba19e9524..ddcfb4a3f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # select build image -FROM rust:1.80.0 AS builder +FROM rust:1.81.0 AS builder # create a new empty shell project RUN USER=root cargo new --bin trin diff --git a/docker/Dockerfile.bridge b/docker/Dockerfile.bridge index d7de25324..62553cddb 100644 --- a/docker/Dockerfile.bridge +++ b/docker/Dockerfile.bridge @@ -10,7 +10,7 @@ RUN mkdir /portal-accumulators COPY ./portal-accumulators /portal-accumulators # select build image -FROM rust:1.80.0 AS builder +FROM rust:1.81.0 AS builder # create a new empty shell project RUN USER=root cargo new --bin trin diff --git a/utp-testing/docker/Dockerfile b/utp-testing/docker/Dockerfile index e0cc02fae..bae193358 100644 --- a/utp-testing/docker/Dockerfile +++ b/utp-testing/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.80.0-bullseye AS builder +FROM rust:1.81.0-bullseye AS builder RUN apt-get update \ && apt-get install clang -y \