Skip to content

Commit 40f3615

Browse files
okJiangJmPotato
authored andcommitted
go: update Go version to 1.25.3 (tikv#9900)
close tikv#10034 Signed-off-by: okjiang <819421878@qq.com>
1 parent 17478bb commit 40f3615

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+149
-111
lines changed

.github/workflows/check.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ jobs:
1010
steps:
1111
- name: Checkout code
1212
uses: actions/checkout@v4
13-
- uses: actions/setup-go@v5
13+
- uses: actions/setup-go@v6
1414
with:
15-
go-version: '1.23'
15+
go-version: '1.25'
16+
check-latest: true
1617
- name: Make Check
1718
run: |
1819
make build

.github/workflows/pd-docker-image.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ jobs:
1717
steps:
1818
- name: Checkout code
1919
uses: actions/checkout@v4
20-
- uses: actions/setup-go@v5
20+
- uses: actions/setup-go@v6
2121
with:
22-
go-version: '1.23'
22+
go-version: '1.25'
23+
check-latest: true
2324
- name: Make
2425
run: make docker-image

.github/workflows/pd-tests.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ jobs:
5555
steps:
5656
- name: Checkout code
5757
uses: actions/checkout@v4
58-
- uses: actions/setup-go@v5
58+
- uses: actions/setup-go@v6
5959
with:
60-
go-version: '1.23'
60+
go-version: '1.25'
61+
check-latest: true
6162
- name: ${{ matrix.name }}
6263
env:
6364
WORKER_ID: ${{ matrix.worker_id }}

.github/workflows/tso-function-test.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ jobs:
2727
steps:
2828
- name: Checkout code
2929
uses: actions/checkout@v4
30-
- uses: actions/setup-go@v5
30+
- uses: actions/setup-go@v6
3131
with:
32-
go-version: '1.23'
32+
go-version: '1.25'
33+
check-latest: true
3334
- name: Make TSO Function Test
3435
run: make test-tso-function

.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ linters:
5151
- appendAssign
5252
- exitAfterDefer
5353
- ifElseChain
54+
- deprecatedComment
55+
# govet:
56+
# disable:
57+
# - buildtag
5458
goheader:
5559
values:
5660
regexp:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-alpine as builder
1+
FROM golang:1.25-alpine as builder
22

33
RUN apk add --no-cache \
44
make \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ SHELL := env PATH='$(PATH)' GOBIN='$(GO_TOOLS_BIN_PATH)' $(shell which bash)
180180

181181
install-tools:
182182
@mkdir -p $(GO_TOOLS_BIN_PATH)
183-
@which golangci-lint >/dev/null 2>&1 || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_TOOLS_BIN_PATH) v2.1.2
183+
@which golangci-lint >/dev/null 2>&1 || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_TOOLS_BIN_PATH) v2.6.0
184184
@grep '_' tools.go | sed 's/"//g' | awk '{print $$2}' | xargs go install
185185

186186
.PHONY: install-tools

client/client.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ func (c *client) GetTSAsync(ctx context.Context) tso.TSFuture {
519519
}
520520

521521
// GetLocalTSAsync implements the TSOClient interface.
522+
//
522523
// Deprecated: the Local TSO feature has been deprecated. Regardless of the
523524
// parameters passed, the behavior of this interface will be equivalent to
524525
// `GetTSAsync`. If you want to use a separately deployed TSO service,
@@ -587,6 +588,7 @@ func (c *client) GetTS(ctx context.Context) (physical int64, logical int64, err
587588
}
588589

589590
// GetLocalTS implements the TSOClient interface.
591+
//
590592
// Deprecated: the Local TSO feature has been deprecated. Regardless of the
591593
// parameters passed, the behavior of this interface will be equivalent to
592594
// `GetTS`. If you want to use a separately deployed TSO service,

client/clients/router/client.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ type Client interface {
153153
// Limit limits the maximum number of regions returned. It returns all the regions in the given range if limit <= 0.
154154
// If a region has no leader, corresponding leader will be placed by a peer
155155
// with empty value (PeerID is 0).
156+
//
156157
// Deprecated: use BatchScanRegions instead.
157158
ScanRegions(ctx context.Context, key, endKey []byte, limit int, opts ...opt.GetRegionOption) ([]*Region, error)
158159
// BatchScanRegions gets a list of regions, starts from the region that contains key.

client/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/tikv/pd/client
22

3-
go 1.23.12
3+
go 1.25.5
44

55
require (
66
github.com/BurntSushi/toml v0.3.1

0 commit comments

Comments
 (0)