From 0dc26d9c99e6b180f7c079b0ddcd88c15df9175e Mon Sep 17 00:00:00 2001 From: congqixia Date: Fri, 7 Nov 2025 11:39:34 +0800 Subject: [PATCH] enhance: [hotfix] Bump go version to 1.24.9 (#45359) (#45378) Cherry-pick from master pr: #45359 Fixing CVE-2025-58187 Signed-off-by: Congqi Xia --- .github/workflows/mac.yaml | 3 ++- build/docker/builder/cpu/amazonlinux2023/Dockerfile | 2 +- build/docker/builder/cpu/rockylinux8/Dockerfile | 2 +- build/docker/builder/cpu/ubuntu20.04/Dockerfile | 2 +- build/docker/builder/cpu/ubuntu22.04/Dockerfile | 2 +- build/docker/builder/gpu/ubuntu20.04/Dockerfile | 2 +- build/docker/builder/gpu/ubuntu22.04/Dockerfile | 2 +- client/README.md | 2 +- client/go.mod | 2 +- go.mod | 2 +- pkg/go.mod | 2 +- tests/go_client/Dockerfile | 2 +- tests/go_client/go.mod | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml index bca4604d8d..d6350d8412 100644 --- a/.github/workflows/mac.yaml +++ b/.github/workflows/mac.yaml @@ -61,7 +61,8 @@ jobs: - name: Setup Go environment uses: actions/setup-go@v4 with: - go-version: '1.24.6' + go-version: '1.24.9' + cache: false - name: Download Caches uses: ./.github/actions/macos-cache-restore - name: Code Check diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index 3b819b6f44..31d38ea731 100644 --- a/build/docker/builder/cpu/amazonlinux2023/Dockerfile +++ b/build/docker/builder/cpu/amazonlinux2023/Dockerfile @@ -22,7 +22,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.9.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ go clean --modcache && \ chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) diff --git a/build/docker/builder/cpu/rockylinux8/Dockerfile b/build/docker/builder/cpu/rockylinux8/Dockerfile index 5cd33a5093..481ec21752 100644 --- a/build/docker/builder/cpu/rockylinux8/Dockerfile +++ b/build/docker/builder/cpu/rockylinux8/Dockerfile @@ -27,7 +27,7 @@ RUN dnf -y update && \ RUN pip3 install conan==1.64.1 -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.9.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go RUN curl https://sh.rustup.rs -sSf | \ sh -s -- --default-toolchain=1.89 -y diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index 7e20d23b29..794d1f4cb5 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -30,7 +30,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.9.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ go clean --modcache && \ chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile index dd6c576314..37cbc30043 100644 --- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile @@ -36,7 +36,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.9.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ go clean --modcache && \ chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index 4491313428..af0477abca 100644 --- a/build/docker/builder/gpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu20.04/Dockerfile @@ -41,7 +41,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.9.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOROOT}/bin v1.46.2 && \ # export GO111MODULE=on && go get github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.2.1 && \ diff --git a/build/docker/builder/gpu/ubuntu22.04/Dockerfile b/build/docker/builder/gpu/ubuntu22.04/Dockerfile index 4296463c24..58d8297fb0 100644 --- a/build/docker/builder/gpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu22.04/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce # Install go -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.9.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go # Install conan RUN pip3 install conan==1.64.1 # Install rust diff --git a/client/README.md b/client/README.md index 0c8eba4c93..03857bcec5 100644 --- a/client/README.md +++ b/client/README.md @@ -10,7 +10,7 @@ Go MilvusClient for [Milvus](https://github.com/milvus-io/milvus). To contribute ### Prerequisites -Go 1.24.6 or higher +Go 1.24.9 or higher ### Install Milvus Go SDK diff --git a/client/go.mod b/client/go.mod index 0965805e93..4d449d08a7 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus/client/v2 -go 1.24.6 +go 1.24.9 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/go.mod b/go.mod index 606b336100..c242d5fc52 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus -go 1.24.6 +go 1.24.9 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 diff --git a/pkg/go.mod b/pkg/go.mod index 313e1fbd62..2b5fcbb5ad 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus/pkg/v2 -go 1.24.6 +go 1.24.9 require ( cloud.google.com/go/storage v1.50.0 diff --git a/tests/go_client/Dockerfile b/tests/go_client/Dockerfile index d11bdb14a8..4863ae6e3c 100644 --- a/tests/go_client/Dockerfile +++ b/tests/go_client/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.6 as builder +FROM golang:1.24.9 as builder # Define a build argument with an empty default value ARG CUSTOM_GOPROXY="" diff --git a/tests/go_client/go.mod b/tests/go_client/go.mod index 67d0dcfab0..182a16347c 100644 --- a/tests/go_client/go.mod +++ b/tests/go_client/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus/tests/go_client -go 1.24.6 +go 1.24.9 require ( github.com/milvus-io/milvus/client/v2 v2.0.0-20241125024034-0b9edb62a92d