From 27f2ad0f3a5a2ff7989e26c254d4bc0a287facbe Mon Sep 17 00:00:00 2001 From: crazycs Date: Thu, 10 Aug 2023 22:05:00 +0800 Subject: [PATCH] ci: update go version (#936) * ci: update go version Signed-off-by: crazycs520 * fix test Signed-off-by: crazycs520 --------- Signed-off-by: crazycs520 --- .github/workflows/compatibility.yml | 2 +- .github/workflows/integration.yml | 8 ++++---- .github/workflows/test.yml | 6 +++--- internal/client/main_test.go | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index c62c5b7e..e598e4b6 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.20.x" + go-version: "1.21.0" - name: Checkout Client-Go uses: actions/checkout@v2 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 5312ab10..cde5c9d8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.2 + go-version: 1.21.0 - name: Test run: go test ./... @@ -32,7 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.2 + go-version: 1.21.0 - name: Test run: go test ./... -race @@ -47,7 +47,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.2 + go-version: 1.21.0 - name: Fetch PD uses: shrink/actions-docker-extract@v1 @@ -89,7 +89,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.2 + go-version: 1.21.0 - name: Fetch PD uses: shrink/actions-docker-extract@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 79268c86..50c49097 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.2 + go-version: 1.21.0 - name: Test run: go test ./... @@ -28,7 +28,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.2 + go-version: 1.21.0 - name: Test with race run: go test -race ./... @@ -42,7 +42,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.2 + go-version: 1.21.0 - name: Lint uses: golangci/golangci-lint-action@v3 diff --git a/internal/client/main_test.go b/internal/client/main_test.go index c4d2be24..6a22714f 100644 --- a/internal/client/main_test.go +++ b/internal/client/main_test.go @@ -26,6 +26,7 @@ func TestMain(m *testing.M) { opts := []goleak.Option{ goleak.IgnoreTopFunction("google.golang.org/grpc.(*ClientConn).WaitForStateChange"), goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/internal/retry.newBackoffFn.func1"), + goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/internal/retry.(*Config).createBackoffFn.newBackoffFn.func2"), } goleak.VerifyTestMain(m, opts...) }