From 9886d7d4b68d3686d2d5cc86e0aed6bfddf87ea9 Mon Sep 17 00:00:00 2001 From: zhikunyao Date: Wed, 2 Jul 2025 11:36:43 +0800 Subject: [PATCH] enhance: Master updatecmake zhikun (#43023) Signed-off-by: Zhikun Yao --- .env | 8 ++++---- .github/workflows/publish-gpu-builder.yaml | 12 +----------- build/docker/builder/cpu/ubuntu22.04/Dockerfile | 2 +- build/docker/builder/gpu/ubuntu22.04/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.env b/.env index 994feb3d47..5fa1d9ff4e 100644 --- a/.env +++ b/.env @@ -5,11 +5,11 @@ IMAGE_ARCH=amd64 OS_NAME=ubuntu22.04 # for services.builder.image in docker-compose.yml -DATE_VERSION=20250508-f0451d2 -LATEST_DATE_VERSION=20250508-f0451d2 +DATE_VERSION=20250628-af8479b +LATEST_DATE_VERSION=20250628-af8479b # for services.gpubuilder.image in docker-compose.yml -GPU_DATE_VERSION=20250509-3a7b2fe -LATEST_GPU_DATE_VERSION=20250509-3a7b2fe +GPU_DATE_VERSION=20250628-af8479b +LATEST_GPU_DATE_VERSION=20250628-af8479b # for other services in docker-compose.yml MINIO_ADDRESS=minio:9000 diff --git a/.github/workflows/publish-gpu-builder.yaml b/.github/workflows/publish-gpu-builder.yaml index 5d3bc2d1a6..37f0c1a74d 100644 --- a/.github/workflows/publish-gpu-builder.yaml +++ b/.github/workflows/publish-gpu-builder.yaml @@ -29,21 +29,11 @@ concurrency: jobs: publish-gpu-builder: - runs-on: ${{ inputs.RunnerHost || 'ubuntu-latest' }} + runs-on: self-hosted timeout-minutes: 500 env: OS: ubuntu22.04 steps: - - name: Maximize build space - uses: easimon/maximize-build-space@master - if: ${{ ! startsWith(runner.name, 'self') }} # skip this step if it is self-hosted runner - with: - root-reserve-mb: 20480 - # overprovision-lvm: 'true' - swap-size-mb: 1024 - remove-dotnet: 'true' - remove-android: 'true' - remove-haskell: 'true' - name: Checkout uses: actions/checkout@v2 - name: Get version from system time after release step diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile index 60f3b4d6ff..23ba90329c 100644 --- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y gcc-12 g++-12 && cd /usr/bin \ RUN pip3 install conan==1.64.1 RUN echo "target arch $TARGETARCH" -RUN wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local +RUN wget -qO- "https://cmake.org/files/v3.31/cmake-3.31.8-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local RUN mkdir /opt/vcpkg && \ wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ diff --git a/build/docker/builder/gpu/ubuntu22.04/Dockerfile b/build/docker/builder/gpu/ubuntu22.04/Dockerfile index 526081379a..86175ab01a 100644 --- a/build/docker/builder/gpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu22.04/Dockerfile @@ -3,7 +3,7 @@ FROM nvidia/cuda:11.8.0-devel-ubuntu22.04 as builder ARG TARGETARCH RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-certificates gnupg2 ninja-build && \ - wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ + wget -qO- "https://cmake.org/files/v3.31/cmake-3.31.8-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ apt-get update && apt-get install -y --no-install-recommends \ g++ gcc gfortran git make ccache libssl-dev zlib1g-dev zip unzip \ clang-format-12 clang-tidy-12 lcov libtool m4 autoconf automake python3 python3-pip \