Skip to content

Commit

Permalink
Merge pull request #114 from acumino/cleanup/pr
Browse files Browse the repository at this point in the history
Remove install-requirement and use tools.mk
  • Loading branch information
ScheererJ authored Aug 1, 2022
2 parents 6360e17 + 39aadac commit d7d445a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/local
**/dev
/bin
hack/tools/bin

*.coverprofile
*.html
Expand Down
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ LD_FLAGS := "-w -X github.com/gardener/$(EXTENSION_PREFIX)-$(
LEADER_ELECTION := false
IGNORE_OPERATION_ANNOTATION := true

#########################################
# Tools #
#########################################

TOOLS_DIR := hack/tools
include vendor/github.com/gardener/gardener/hack/tools.mk

#########################################
# Rules for local development scenarios #
#########################################
Expand Down Expand Up @@ -59,13 +66,6 @@ docker-images:
# Rules for verification, formatting, linting, testing and cleaning #
#####################################################################

.PHONY: install-requirements
install-requirements:
@go install -mod=vendor $(REPO_ROOT)/vendor/github.com/ahmetb/gen-crd-api-reference-docs
@go install -mod=vendor $(REPO_ROOT)/vendor/github.com/golang/mock/mockgen
@go install -mod=vendor $(REPO_ROOT)/vendor/golang.org/x/tools/cmd/goimports
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/install-requirements.sh

.PHONY: revendor
revendor:
@GO111MODULE=on go mod vendor
Expand All @@ -85,16 +85,16 @@ check-generate:
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-generate.sh $(REPO_ROOT)

.PHONY: check
check:
check: $(GOIMPORTS) $(GOLANGCI_LINT)
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/... ./test/...
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-charts.sh ./charts

.PHONY: generate
generate:
generate: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCKGEN)
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate.sh ./charts/... ./cmd/... ./pkg/... ./test/...

.PHONY: format
format:
format: $(GOIMPORTS)
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/format.sh ./cmd ./pkg ./test

.PHONY: test
Expand All @@ -113,4 +113,4 @@ test-cov-clean:
verify: check format test

.PHONY: verify-extended
verify-extended: install-requirements check-generate check format test-cov test-cov-clean
verify-extended: check-generate check format test-cov test-cov-clean
Empty file added hack/tools/bin/.gitkeep
Empty file.

0 comments on commit d7d445a

Please sign in to comment.