From 6fe4f34c4c4956521d4a0d2425bf3dba4587e2ad Mon Sep 17 00:00:00 2001 From: Steve Degosserie <723552+stiiifff@users.noreply.github.com> Date: Thu, 11 Sep 2025 09:56:14 +0200 Subject: [PATCH] fix: Update Rust toolchain and Docker build dependencies (#156) ## Summary - Upgraded Rust toolchain from 1.87 to 1.88 for latest compiler improvements - Updated Docker build environment with latest paritytech base image and build tools - Fixed node branding and support URL to reflect DataHaven project ## Changes ### Rust Toolchain Update (`rust-toolchain.toml`) - Upgraded from Rust 1.87 to 1.88 ### Docker Build Environment (`Dockerfile`) - Updated base image from `paritytech/ci-unified:bullseye-1.85.0` to `bullseye-1.88.0` - Upgraded mold linker from v2.39.0 to v2.40.4 for faster builds - Added protoc v21.12 for protobuf compilation support - Added libpq-dev dependency for PostgreSQL integration - Updated cargo-chef from 0.1.71 to 0.1.72 --------- Co-authored-by: Claude --- .github/workflows/DOCKER-PROD.yml | 2 +- operator/Dockerfile | 12 +++++++++--- operator/node/src/command.rs | 4 ++-- operator/rust-toolchain.toml | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/DOCKER-PROD.yml b/.github/workflows/DOCKER-PROD.yml index fd07c64f..a306ac50 100644 --- a/.github/workflows/DOCKER-PROD.yml +++ b/.github/workflows/DOCKER-PROD.yml @@ -36,7 +36,7 @@ jobs: with: ref: ${{ github.event.inputs.branch || github.ref }} - - uses: ./.github/workflows/actions/cleanup-runner + # Cleanup-runner skipped on self-hosted runners (bare-metal manages disk space externally) - name: Docker meta (dispatch) if: github.event_name == 'workflow_dispatch' diff --git a/operator/Dockerfile b/operator/Dockerfile index 10538e90..df41dd53 100644 --- a/operator/Dockerfile +++ b/operator/Dockerfile @@ -1,25 +1,31 @@ # --- Setup Build Environment --- -FROM docker.io/paritytech/ci-unified:bullseye-1.85.0 AS base +FROM docker.io/paritytech/ci-unified:bullseye-1.88.0 AS base -ARG MOLD_VERSION=2.39.0 +ARG MOLD_VERSION=2.40.4 +ARG PROTOC_VER=21.12 ARG SCCACHE_VERSION=0.10.0 ARG FAST_RUNTIME=FALSE RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ xz-utils \ clang \ + libpq-dev \ && echo "Installing mold v${MOLD_VERSION}..." \ && curl -Lo mold.tar.gz "https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-x86_64-linux.tar.gz" \ && tar -xf mold.tar.gz --strip-components=1 -C /usr/local \ && rm mold.tar.gz \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ + && echo "Installing protoc v${PROTOC_VER}..." \ + && curl -Lo protoc.zip "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-linux-x86_64.zip" \ + && unzip -q protoc.zip -d /usr/local/ \ + && rm protoc.zip \ && echo "Installing sccache v${SCCACHE_VERSION}..." \ && curl -Lo sccache.tar.gz "https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-x86_64-unknown-linux-musl.tar.gz" \ && tar -xf sccache.tar.gz --strip-components=1 -C /usr/local/bin sccache-v${SCCACHE_VERSION}-x86_64-unknown-linux-musl/sccache \ && rm sccache.tar.gz -RUN cargo install cargo-chef --version 0.1.71 --locked +RUN cargo install cargo-chef --version 0.1.72 --locked ENV RUSTC_WRAPPER=sccache \ SCCACHE_DIR=/usr/local/sccache \ diff --git a/operator/node/src/command.rs b/operator/node/src/command.rs index eca65dc3..f9dd7cd4 100644 --- a/operator/node/src/command.rs +++ b/operator/node/src/command.rs @@ -65,7 +65,7 @@ pub struct ProviderOptions { impl SubstrateCli for Cli { fn impl_name() -> String { - "Substrate Node".into() + "DataHaven Node".into() } fn impl_version() -> String { @@ -81,7 +81,7 @@ impl SubstrateCli for Cli { } fn support_url() -> String { - "support.anonymous.an".into() + "https://github.com/datahaven-xyz/datahaven/issues/new".into() } fn copyright_start_year() -> i32 { diff --git a/operator/rust-toolchain.toml b/operator/rust-toolchain.toml index d06910c4..16588d25 100644 --- a/operator/rust-toolchain.toml +++ b/operator/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.87" +channel = "1.88" components = [ "cargo", "clippy",