Skip to content

Commit e6448ac

Browse files
authored
*: update go1.25.6 (#65605)
close #65606
1 parent 13dd959 commit e6448ac

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# production environment, please refer to https://github.com/PingCAP-QE/artifacts/blob/main/dockerfiles/cd/builders/tidb/Dockerfile.
1717

1818
# Builder image
19-
FROM golang:1.25.5 as builder
19+
FROM golang:1.25.6 as builder
2020
WORKDIR /tidb
2121

2222
COPY . .

Dockerfile.enterprise

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# The current dockerfile is only used for development purposes.
1616
# Builder image
17-
FROM golang:1.25.5 as builder
17+
FROM golang:1.25.6 as builder
1818
WORKDIR /tidb
1919

2020
COPY . .

WORKSPACE

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
23
http_archive(
34
name = "platforms",
5+
sha256 = "3384eb1c30762704fbe38e440204e114154086c8fc8a8c2e3e28441028c019a8",
46
urls = [
57
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/1.0.0/platforms-1.0.0.tar.gz",
68
"https://github.com/bazelbuild/platforms/releases/download/1.0.0/platforms-1.0.0.tar.gz",
79
],
8-
sha256 = "3384eb1c30762704fbe38e440204e114154086c8fc8a8c2e3e28441028c019a8",
910
)
1011

1112
# To use the new Starlark host platform in @platforms, also include the following snippet:
1213
load("@platforms//host:extension.bzl", "host_platform_repo")
14+
1315
host_platform_repo(name = "host_platform")
1416

1517
http_archive(
@@ -106,7 +108,7 @@ go_download_sdk(
106108
"https://mirrors.aliyun.com/golang/{}",
107109
"https://dl.google.com/go/{}",
108110
],
109-
version = "1.25.5",
111+
version = "1.25.6",
110112
)
111113

112114
gazelle_dependencies(go_sdk = "go_sdk")

build/image/base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \
3030

3131
# install golang toolchain
3232
# renovate: datasource=docker depName=golang
33-
ARG GOLANG_VERSION=1.25.5
33+
ARG GOLANG_VERSION=1.25.6
3434
RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \
3535
curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz
3636
ENV PATH /usr/local/go/bin/:$PATH

build/image/parser_test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM rockylinux:9
1616

17-
ENV GOLANG_VERSION 1.25.5
17+
ENV GOLANG_VERSION 1.25.6
1818
ENV ARCH amd64
1919
ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
2020
ENV GOPATH /home/prow/go

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/pingcap/tidb
22

3-
go 1.25.5
3+
go 1.25.6
44

55
require (
66
cloud.google.com/go/kms v1.15.8
@@ -13,6 +13,7 @@ require (
1313
github.com/Masterminds/semver v1.5.0
1414
github.com/YangKeao/go-mysql-driver v0.0.0-20240627104025-dd5589458cfa
1515
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1581
16+
github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.3
1617
github.com/apache/arrow-go/v18 v18.0.0
1718
github.com/apache/skywalking-eyes v0.4.0
1819
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
@@ -174,7 +175,6 @@ require (
174175
github.com/alibabacloud-go/tea v1.3.11 // indirect
175176
github.com/alibabacloud-go/tea-utils/v2 v2.0.7 // indirect
176177
github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
177-
github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.3 // indirect
178178
github.com/aliyun/credentials-go v1.4.7 // indirect
179179
github.com/andybalholm/brotli v1.1.1 // indirect
180180
github.com/aws/aws-sdk-go v1.55.7 // indirect

0 commit comments

Comments
 (0)