From 255e8ef68c5137d4e345a65dd48b7dd431b9325d Mon Sep 17 00:00:00 2001 From: Shanshan Date: Mon, 30 Jun 2025 11:35:25 +0800 Subject: [PATCH 1/2] chore: upgrade golagnci to v1.64.8 --- .github/workflows/cicd-pull-request.yml | 2 +- .github/workflows/cicd-push.yml | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cicd-pull-request.yml b/.github/workflows/cicd-pull-request.yml index cb6f5a1f3..decfe3350 100644 --- a/.github/workflows/cicd-pull-request.yml +++ b/.github/workflows/cicd-pull-request.yml @@ -62,7 +62,7 @@ jobs: - name: Install golangci-lint run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.8 - name: make module run: | diff --git a/.github/workflows/cicd-push.yml b/.github/workflows/cicd-push.yml index f21f1fada..e0f3bc725 100644 --- a/.github/workflows/cicd-push.yml +++ b/.github/workflows/cicd-push.yml @@ -139,7 +139,7 @@ jobs: - name: Install golangci-lint run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.8 - name: make module run: | diff --git a/Makefile b/Makefile index 05f5f9e60..4693a830a 100644 --- a/Makefile +++ b/Makefile @@ -257,7 +257,7 @@ install-docker-buildx: ## Create `docker buildx` builder. fi .PHONY: golangci -golangci: GOLANGCILINT_VERSION = v1.55.2 +golangci: GOLANGCILINT_VERSION = v1.64.8 golangci: ## Download golangci-lint locally if necessary. ifneq ($(shell which golangci-lint),) @echo golangci-lint is already installed From cae54ae0fa50f3dd145043afe594f621d8b868a9 Mon Sep 17 00:00:00 2001 From: Shanshan Date: Mon, 30 Jun 2025 13:29:16 +0800 Subject: [PATCH 2/2] fix failed test cases --- pkg/cmd/cluster/create_subcmds_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/cluster/create_subcmds_test.go b/pkg/cmd/cluster/create_subcmds_test.go index 668cd6517..54d6f4c19 100644 --- a/pkg/cmd/cluster/create_subcmds_test.go +++ b/pkg/cmd/cluster/create_subcmds_test.go @@ -48,7 +48,7 @@ var _ = Describe("create cluster by cluster type", func() { const ( clusterType = "apecloud-mysql" redisCluster = "redis" - redisComponent = "redis-cluster-7" + redisComponent = "redis-cluster" ) var (