Skip to content

Commit

Permalink
Remove check-manifest and docforge binary (gardener#8692)
Browse files Browse the repository at this point in the history
* Remove local manifest

* Remove check-docforge

* Remove docfroge binary from tools.mk
  • Loading branch information
Kostov6 authored Oct 25, 2023
1 parent f35b650 commit 4ea4ec8
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 129 deletions.
6 changes: 3 additions & 3 deletions .ci/verify
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ if [ $use_cache = yes ] ; then
done

# run test instead of test-cov to speed-up PR verification as `-cover` flag is not "cacheable"
make check-generate verify check-docforge
make check-generate verify

echo "> moving all cached dirs back to concourse cache dir"
for cache in "${cache_dirs[@]}" ; do
Expand All @@ -55,9 +55,9 @@ if [ $use_cache = yes ] ; then
else
if [ "${TEST_COV+yes}" = yes ] ; then
# supposed to be run in release jobs
make verify-extended check-docforge
make verify-extended
else
# run test instead of test-cov to speed-up jobs, as coverage slows down tests significantly
make check-generate verify check-docforge
make check-generate verify
fi
fi
76 changes: 0 additions & 76 deletions .docforge/manifest.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,6 @@ check-vulnerabilities: $(GO_VULN_CHECK)
test-prometheus: $(PROMTOOL)
@./hack/test-prometheus.sh

.PHONY: check-docforge
check-docforge: $(DOCFORGE)
@./hack/check-docforge.sh

.PHONY: verify
verify: check format test test-integration test-prometheus

Expand Down
39 changes: 0 additions & 39 deletions hack/check-docforge.sh

This file was deleted.

8 changes: 1 addition & 7 deletions hack/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ endif

TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
DOCFORGE := $(TOOLS_BIN_DIR)/docforge
GEN_CRD_API_REFERENCE_DOCS := $(TOOLS_BIN_DIR)/gen-crd-api-reference-docs
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
GOIMPORTS := $(TOOLS_BIN_DIR)/goimports
Expand Down Expand Up @@ -58,7 +57,6 @@ YAML2JSON := $(TOOLS_BIN_DIR)/yaml2json
YQ := $(TOOLS_BIN_DIR)/yq

# default tool versions
DOCFORGE_VERSION ?= v0.34.0
GOLANGCI_LINT_VERSION ?= v1.54.2
GO_APIDIFF_VERSION ?= v0.6.1
GO_ADD_LICENSE_VERSION ?= v1.1.1
Expand Down Expand Up @@ -124,7 +122,7 @@ ifeq ($(shell if [ -d $(TOOLS_BIN_SOURCE_DIR) ]; then echo "found"; fi),found)
endif

.PHONY: create-tools-bin
create-tools-bin: $(CONTROLLER_GEN) $(DOCFORGE) $(GEN_CRD_API_REFERENCE_DOCS) $(GINKGO) $(GOIMPORTS) $(GOIMPORTSREVISER) $(GO_ADD_LICENSE) $(GO_APIDIFF) $(GO_VULN_CHECK) $(GO_TO_PROTOBUF) $(HELM) $(IMPORT_BOSS) $(KIND) $(KUBECTL) $(MOCKGEN) $(OPENAPI_GEN) $(PROMTOOL) $(PROTOC) $(PROTOC_GEN_GOGO) $(SETUP_ENVTEST) $(SKAFFOLD) $(YAML2JSON) $(YQ)
create-tools-bin: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(GINKGO) $(GOIMPORTS) $(GOIMPORTSREVISER) $(GO_ADD_LICENSE) $(GO_APIDIFF) $(GO_VULN_CHECK) $(GO_TO_PROTOBUF) $(HELM) $(IMPORT_BOSS) $(KIND) $(KUBECTL) $(MOCKGEN) $(OPENAPI_GEN) $(PROMTOOL) $(PROTOC) $(PROTOC_GEN_GOGO) $(SETUP_ENVTEST) $(SKAFFOLD) $(YAML2JSON) $(YQ)

#########################################
# Tools #
Expand All @@ -133,10 +131,6 @@ create-tools-bin: $(CONTROLLER_GEN) $(DOCFORGE) $(GEN_CRD_API_REFERENCE_DOCS) $(
$(CONTROLLER_GEN): $(call tool_version_file,$(CONTROLLER_GEN),$(CONTROLLER_GEN_VERSION))
go build -o $(CONTROLLER_GEN) sigs.k8s.io/controller-tools/cmd/controller-gen

$(DOCFORGE): $(call tool_version_file,$(DOCFORGE),$(DOCFORGE_VERSION))
curl -L -o $(DOCFORGE) https://github.com/gardener/docforge/releases/download/$(DOCFORGE_VERSION)/docforge-$(shell uname -s | tr '[:upper:]' '[:lower:]')-$(shell uname -m | sed 's/x86_64/amd64/')
chmod +x $(DOCFORGE)

$(GEN_CRD_API_REFERENCE_DOCS): $(call tool_version_file,$(GEN_CRD_API_REFERENCE_DOCS),$(GEN_CRD_API_REFERENCE_DOCS_VERSION))
go build -o $(GEN_CRD_API_REFERENCE_DOCS) github.com/ahmetb/gen-crd-api-reference-docs

Expand Down

0 comments on commit 4ea4ec8

Please sign in to comment.