Skip to content

Commit 913b2fc

Browse files
committed
fix: address tooling review comments
Signed-off-by: Mateusz Urbanek <[email protected]>
1 parent 028fbd8 commit 913b2fc

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

Makefile

+6-9
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,16 @@ SIDECAR_TAG ?= localhost:5005/cosi-provisioner-sidecar:dev-$(shell git describe
4848
##@ Development
4949

5050
.PHONY: generate
51-
generate: controller/Dockerfile sidecar/Dockerfile ## Generate files
51+
generate: crd-ref-docs controller/Dockerfile sidecar/Dockerfile ## Generate files
5252
$(MAKE) -C client crds
5353
$(MAKE) -C proto generate
54-
$(MAKE) api-docs
55-
%/Dockerfile: hack/Dockerfile.in hack/gen-dockerfile.sh
56-
hack/gen-dockerfile.sh $* > "$@"
57-
.PHONY: api-docs
58-
api-docs: crd-ref-docs
5954
$(CRD_REF_DOCS) \
6055
--config=./docs/.crd-ref-docs.yaml \
6156
--source-path=./client/apis \
6257
--renderer=markdown \
6358
--output-path=./docs/src/api/
59+
%/Dockerfile: hack/Dockerfile.in hack/gen-dockerfile.sh
60+
hack/gen-dockerfile.sh $* > "$@"
6461

6562
.PHONY: codegen
6663
codegen: codegen.client codegen.proto ## Generate code
@@ -116,13 +113,13 @@ build.sidecar: sidecar/Dockerfile ## Build only the sidecar container image
116113
$(DOCKER) build --file sidecar/Dockerfile --platform $(PLATFORM) $(BUILD_ARGS) --tag $(SIDECAR_TAG) .
117114

118115
.PHONY: build-docs
119-
build-docs: mdbook api-docs
116+
build-docs: generate mdbook
120117
cd docs; $(MDBOOK) build
121118

122119
MDBOOK_PORT ?= 3000
123120

124121
.PHONY: serve-docs
125-
serve-docs: mdbook api-docs
122+
serve-docs: generate mdbook
126123
cd docs; $(MDBOOK) serve --port $(MDBOOK_PORT)
127124

128125
.PHONY: clean
@@ -213,7 +210,7 @@ $(KUSTOMIZE)-$(KUSTOMIZE_VERSION): $(TOOLBIN)
213210
.PHONY: mdbook
214211
mdbook: $(MDBOOK)-$(MDBOOK_VERSION)
215212
$(MDBOOK)-$(MDBOOK_VERSION): $(TOOLBIN)
216-
./hack/mdbook.sh $(MDBOOK) $(MDBOOK_VERSION)
213+
./hack/install-mdbook.sh $(MDBOOK) $(MDBOOK_VERSION)
217214

218215
# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
219216
# $1 - target path with name of binary
File renamed without changes.

0 commit comments

Comments
 (0)