gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 16:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump Rust version to 1.88 (#7787)

Browse Source 
In #7743, rust version was bumped:
- msrv to 1.87
- `Dockerfile` to 1.88

We also need to bump the other docker images as well, and might as well keep them all consistent at 1.88.
This commit is contained in:
Jimmy Chen
2025-07-25 15:52:51 +10:00
committed by GitHub
parent b904956074
commit 1a6eeb228c
5 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.reproducible
View File

@@ -1,5 +1,5 @@
# Define the Rust image as an argument with a default to x86_64 Rust 1.82 image based on Debian Bullseye # Define the Rust image as an argument with a default to x86_64 Rust 1.88 image based on Debian Bullseye
ARG RUST_IMAGE="rust:1.82-bullseye@sha256:ac7fe7b0c9429313c0fe87d3a8993998d1fe2be9e3e91b5e2ec05d3a09d87128" ARG RUST_IMAGE="rust:1.88-bullseye@sha256:8e3c421122bf4cd3b2a866af41a4dd52d87ad9e315fd2cb5100e87a7187a9816"
FROM ${RUST_IMAGE} AS builder FROM ${RUST_IMAGE} AS builder
# Install specific version of the build dependencies # Install specific version of the build dependencies

4
Makefile
View File

@@ -89,7 +89,7 @@ build-lcli-riscv64:
SOURCE_DATE := $(shell git log -1 --pretty=%ct) SOURCE_DATE := $(shell git log -1 --pretty=%ct)
# Default image for x86_64 # Default image for x86_64
RUST_IMAGE_AMD64 ?= rust:1.82-bullseye@sha256:ac7fe7b0c9429313c0fe87d3a8993998d1fe2be9e3e91b5e2ec05d3a09d87128 RUST_IMAGE_AMD64 ?= rust:1.88-bullseye@sha256:8e3c421122bf4cd3b2a866af41a4dd52d87ad9e315fd2cb5100e87a7187a9816
# Reproducible build for x86_64 # Reproducible build for x86_64
build-reproducible-x86_64: build-reproducible-x86_64:
@@ -101,7 +101,7 @@ build-reproducible-x86_64:
-t lighthouse:reproducible-amd64 . -t lighthouse:reproducible-amd64 .
# Default image for arm64 # Default image for arm64
RUST_IMAGE_ARM64 ?= rust:1.82-bullseye@sha256:3c1b8b6487513ad4e753d008b960260f5bcc81bf110883460f6ed3cd72bf439b RUST_IMAGE_ARM64 ?= rust:1.88-bullseye@sha256:8b22455a7ce2adb1355067638284ee99d21cc516fab63a96c4514beaf370aa94
# Reproducible build for aarch64 # Reproducible build for aarch64
build-reproducible-aarch64: build-reproducible-aarch64:

14
common/warp_utils/src/reject.rs
View File

@@ -237,15 +237,9 @@ pub async fn handle_rejection(err: warp::Rejection) -> Result<impl warp::Reply,
pub async fn convert_rejection<T: Reply>(res: Result<T, warp::Rejection>) -> Response { pub async fn convert_rejection<T: Reply>(res: Result<T, warp::Rejection>) -> Response {
match res { match res {
Ok(response) => response.into_response(), Ok(response) => response.into_response(),
Err(e) => match handle_rejection(e).await { Err(e) => {
Ok(reply) => reply.into_response(), let Ok(reply) = handle_rejection(e).await;
// We can simplify this once Rust 1.82 is MSRV reply.into_response()
#[allow(unreachable_patterns)] }
Err(_) => warp::reply::with_status(
warp::reply::json(&"unhandled error"),
eth2::StatusCode::INTERNAL_SERVER_ERROR,
)
.into_response(),
},
} }
} }

2
lcli/Dockerfile
View File

@@ -1,7 +1,7 @@
# `lcli` requires the full project to be in scope, so this should be built either: # `lcli` requires the full project to be in scope, so this should be built either:
# - from the `lighthouse` dir with the command: `docker build -f ./lcli/Dockerflie .` # - from the `lighthouse` dir with the command: `docker build -f ./lcli/Dockerflie .`
# - from the current directory with the command: `docker build -f ./Dockerfile ../` # - from the current directory with the command: `docker build -f ./Dockerfile ../`
FROM rust:1.84.0-bullseye AS builder FROM rust:1.88.0-bullseye AS builder
RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake libclang-dev RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake libclang-dev
COPY . lighthouse COPY . lighthouse
ARG FEATURES ARG FEATURES

2
lighthouse/Cargo.toml
View File

@@ -4,7 +4,7 @@ version = "7.1.0"
authors = ["Sigma Prime <contact@sigmaprime.io>"] authors = ["Sigma Prime <contact@sigmaprime.io>"]
edition = { workspace = true } edition = { workspace = true }
autotests = false autotests = false
rust-version = "1.87.0" rust-version = "1.88.0"
# Prevent cargo-udeps from flagging the dummy package `target_check`, which exists only # Prevent cargo-udeps from flagging the dummy package `target_check`, which exists only
# to assert properties of the compilation target. # to assert properties of the compilation target.