mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2025-12-23 06:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump Golang version from 1.24-bookworm to 1.25-bookworm

Browse Source 
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 <xun.jiang@broadcom.com>
This commit is contained in:
Xun Jiang
2025-11-24 18:58:05 +08:00
committed by Xun Jiang/Bruce Jiang
parent f6b3852d2f
commit 758f6a4847
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pr-linter-check.yml vendored
View File

@@ -28,5 +28,5 @@ jobs:
- name: Linter check - name: Linter check
uses: golangci/golangci-lint-action@v9 uses: golangci/golangci-lint-action@v9
with: with:
version: v2.1.1 version: v2.5.0
args: --verbose args: --verbose

4
Dockerfile
View File

@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
# Velero binary build section # 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 GOPROXY
ARG BIN ARG BIN
@@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \
go clean -modcache -cache go clean -modcache -cache
# Restic binary build section # 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 GOPROXY
ARG BIN ARG BIN

2
Dockerfile-Windows
View File

@@ -15,7 +15,7 @@
ARG OS_VERSION=1809 ARG OS_VERSION=1809
# Velero binary build section # 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 GOPROXY
ARG BIN ARG BIN

2
Tiltfile
View File

@@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(
tilt_helper_dockerfile_header = """ tilt_helper_dockerfile_header = """
# Tilt image # Tilt image
FROM golang:1.24 as tilt-helper FROM golang:1.25 as tilt-helper
# Support live reloading with Tilt # Support live reloading with Tilt
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \

2
go.mod
View File

@@ -1,6 +1,6 @@
module github.com/vmware-tanzu/velero module github.com/vmware-tanzu/velero
go 1.24.0 go 1.25.0
require ( require (
cloud.google.com/go/storage v1.55.0 cloud.google.com/go/storage v1.55.0

4
hack/build-image/Dockerfile
View File

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM --platform=$TARGETPLATFORM golang:1.24-bookworm FROM --platform=$TARGETPLATFORM golang:1.25-bookworm
ARG GOPROXY ARG GOPROXY
@@ -94,7 +94,7 @@ RUN ARCH=$(go env GOARCH) && \
chmod +x /usr/bin/goreleaser chmod +x /usr/bin/goreleaser
# get golangci-lint # 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 # 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 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