From 758f6a48475bc154dae281f64e62305be855b698 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Mon, 24 Nov 2025 18:58:05 +0800 Subject: [PATCH] Bump Golang version from 1.24-bookworm to 1.25-bookworm Bump golangci-lint to v1.25.0, because golangci-lint start to support Golang v1.25 since v1.24.0, and v1.26.x was not stable yet. Align action pr-linter-check's golangci-lint version to v1.25.0 Signed-off-by: Xun Jiang --- .github/workflows/pr-linter-check.yml | 2 +- Dockerfile | 4 ++-- Dockerfile-Windows | 2 +- Tiltfile | 2 +- go.mod | 2 +- hack/build-image/Dockerfile | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr-linter-check.yml b/.github/workflows/pr-linter-check.yml index 13205bcd8..79d7918b2 100644 --- a/.github/workflows/pr-linter-check.yml +++ b/.github/workflows/pr-linter-check.yml @@ -28,5 +28,5 @@ jobs: - name: Linter check uses: golangci/golangci-lint-action@v9 with: - version: v2.1.1 + version: v2.5.0 args: --verbose diff --git a/Dockerfile b/Dockerfile index 94d7ceb9c..6ce46ca3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS velero-builder ARG GOPROXY ARG BIN @@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS restic-builder +FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS restic-builder ARG GOPROXY ARG BIN diff --git a/Dockerfile-Windows b/Dockerfile-Windows index d20ab7748..ac22531dc 100644 --- a/Dockerfile-Windows +++ b/Dockerfile-Windows @@ -15,7 +15,7 @@ ARG OS_VERSION=1809 # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS velero-builder +FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS velero-builder ARG GOPROXY ARG BIN diff --git a/Tiltfile b/Tiltfile index fd0879cd4..7f2029f6d 100644 --- a/Tiltfile +++ b/Tiltfile @@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip( tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.24 as tilt-helper +FROM golang:1.25 as tilt-helper # Support live reloading with Tilt RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \ diff --git a/go.mod b/go.mod index 28009e8fc..0dccd1af3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/velero -go 1.24.0 +go 1.25.0 require ( cloud.google.com/go/storage v1.55.0 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 9e8153e73..68a34fbf0 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$TARGETPLATFORM golang:1.24-bookworm +FROM --platform=$TARGETPLATFORM golang:1.25-bookworm ARG GOPROXY @@ -94,7 +94,7 @@ RUN ARCH=$(go env GOARCH) && \ chmod +x /usr/bin/goreleaser # get golangci-lint -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.1.1 +RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0 # install kubectl RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/$(go env GOARCH)/kubectl