Skip to content

Commit e0a7f1a

Browse files
committed
Add makefile entries for api-lint
1 parent 5b4fbb9 commit e0a7f1a

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/kal.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,5 @@ jobs:
2020
persist-credentials: false
2121
- name: Set up Go
2222
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
23-
- name: Install Golang CI Lint
24-
run: go install github.com/golangci/golangci-lint/v2/cmd/[email protected]
25-
- name: Build KAL
26-
run: golangci-lint custom
27-
- name: run api linter
28-
run: ./bin/golangci-kube-api-linter run -c ./.golangci-kal.yml ./...
23+
- name: Run API Linter
24+
run: make api-lint

Makefile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,12 @@ lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes
160160
ci-lint: golangci-lint
161161
$(GOLANGCI_LINT) run --timeout 15m0s
162162

163+
.PHONY: api-lint
164+
api-lint: golangci-api-lint
165+
$(GOLANGCI_API_LINT) run -c .golangci-kal.yml --timeout 15m0s ./...
166+
163167
.PHONY: verify
164-
verify: vet fmt-verify generate ci-lint verify-all
168+
verify: vet fmt-verify generate ci-lint api-lint verify-all
165169
git --no-pager diff --exit-code config api client-go
166170

167171
.PHONY: verify-crds
@@ -365,6 +369,7 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize
365369
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
366370
ENVTEST ?= $(LOCALBIN)/setup-envtest
367371
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
372+
GOLANGCI_API_LINT = $(LOCALBIN)/golangci-kube-api-linter
368373
HELM = $(PROJECT_DIR)/bin/helm
369374
YQ = $(PROJECT_DIR)/bin/yq
370375
KUBECTL_VALIDATE = $(PROJECT_DIR)/bin/kubectl-validate
@@ -399,6 +404,11 @@ golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
399404
$(GOLANGCI_LINT): $(LOCALBIN)
400405
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
401406

407+
.PHONY: golangci-api-lint
408+
golangci-api-lint: golangci-lint $(GOLANGCI_API_LINT) ## Download golangci-lint locally if necessary before building KAL
409+
$(GOLANGCI_API_LINT):
410+
$(GOLANGCI_LINT) custom
411+
402412
.PHONY: yq
403413
yq: ## Download yq locally if necessary.
404414
GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install github.com/mikefarah/yq/[email protected]

0 commit comments

Comments
 (0)