Skip to content

Commit 8c65f1a

Browse files
chore: tidy prefligth internal types to release11 (#683)
Co-authored-by: huangzhangshu <109708205+JashBook@users.noreply.github.com>
1 parent 4f62d15 commit 8c65f1a

52 files changed

Lines changed: 611 additions & 3600 deletions

Some content is hidden

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

.github/workflows/pull-request-user-interaction.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
4141
- name: Add labels
4242
if: ${{ env.ISINTERACTION != null }}
43-
uses: actions-cool/issues-helper@v3
43+
uses: apecloud-inc/issues-helper@v3
4444
with:
4545
actions: 'add-labels'
4646
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,16 @@ install-docker-buildx: ## Create `docker buildx` builder.
256256
echo "Buildx builder $(BUILDX_BUILDER) already exists"; \
257257
fi
258258

259+
GOLANGCILINT_VERSION ?= v2.8.0
260+
GOLANGCILINT_EXPECTED_VERSION = $(patsubst v%,%,$(GOLANGCILINT_VERSION))
261+
GOLANGCILINT_GOBIN_VERSION = $(shell [ -x "$(GOBIN)/golangci-lint" ] && $(GOBIN)/golangci-lint version 2>/dev/null | sed -n 's/.*version \([0-9.]*\).*/\1/p' | head -1)
262+
259263
.PHONY: golangci
260-
golangci: GOLANGCILINT_VERSION = v2.8.0
261264
golangci: ## Download golangci-lint locally if necessary.
262-
ifeq ($(shell golangci-lint version >/dev/null 2>&1 && echo ok),ok)
263-
@echo golangci-lint is already installed
264-
GOLANGCILINT=$(shell which golangci-lint)
265-
else ifeq (, $(shell which $(GOBIN)/golangci-lint))
265+
ifeq ($(GOLANGCILINT_EXPECTED_VERSION),$(GOLANGCILINT_GOBIN_VERSION))
266+
@echo golangci-lint $(GOLANGCILINT_VERSION) is already installed
267+
GOLANGCILINT=$(GOBIN)/golangci-lint
268+
else
266269
@{ \
267270
set -e ;\
268271
echo 'installing golangci-lint-$(GOLANGCILINT_VERSION)' ;\
@@ -273,9 +276,6 @@ else ifeq (, $(shell which $(GOBIN)/golangci-lint))
273276
echo 'Successfully installed' ;\
274277
}
275278
GOLANGCILINT=$(GOBIN)/golangci-lint
276-
else
277-
@echo golangci-lint is already installed
278-
GOLANGCILINT=$(GOBIN)/golangci-lint
279279
endif
280280

281281
.PHONY: staticchecktool

go.mod

Lines changed: 130 additions & 114 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 309 additions & 389 deletions
Large diffs are not rendered by default.

pkg/cmd/kubeblocks/data/ack_hostpreflight.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

pkg/cmd/kubeblocks/data/ack_preflight.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

pkg/cmd/kubeblocks/data/eks_hostpreflight.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

pkg/cmd/kubeblocks/data/eks_preflight.yaml

Lines changed: 0 additions & 65 deletions
This file was deleted.

pkg/cmd/kubeblocks/data/gke_hostpreflight.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

pkg/cmd/kubeblocks/data/gke_preflight.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)