Merge pull request #6159 from sbueringer/pr-refactor-book-verification

🌱 book: refactor verification

Author: k8s-ci-robot

Makefile

@@ -316,7 +316,7 @@ APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
 apidiff: $(GO_APIDIFF) ## Check for API differences
 	$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible
 
-ALL_VERIFY_CHECKS = doctoc boilerplate shellcheck tiltfile modules gen conversions docker-provider book-links
+ALL_VERIFY_CHECKS = doctoc boilerplate shellcheck tiltfile modules gen conversions docker-provider
 
 .PHONY: verify
 verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) ## Run all verify-* targets
@@ -364,10 +364,6 @@ verify-docker-provider:
 	@echo "Verifying CAPD"
 	cd $(CAPD_DIR); $(MAKE) verify
 
-.PHONY: verify-book-links
-verify-book-links: ## Verify book links
-	$(MAKE) -C docs/book verify
-
 ## --------------------------------------
 ## Binaries
 ## --------------------------------------
@@ -435,6 +431,10 @@ docker-build-kubeadm-control-plane: ## Build the docker image for kubeadm contro
 e2e-framework: ## Builds the CAPI e2e framework
 	cd $(E2E_FRAMEWORK_DIR); go build ./...
 
+.PHONY: build-book
+build-book: ## Build the book
+	$(MAKE) -C docs/book build
+
 .PHONY: serve-book
 serve-book: ## Build and serve the book (with live-reload)
 	$(MAKE) -C docs/book serve

docs/book/Makefile

@@ -38,18 +38,10 @@ MDBOOK := $(TOOLS_BIN_DIR)/mdbook
 $(MDBOOK):
 	$(CRATE_INSTALL) --git rust-lang/mdBook --tag v0.4.11 --to $(TOOLS_BIN_DIR) --force
 
-MDBOOK_LINKCHECK := $(TOOLS_BIN_DIR)/mdbook-linkcheck
-$(MDBOOK_LINKCHECK):
-	$(CRATE_INSTALL) --git Michael-F-Bryan/mdbook-linkcheck --tag v0.7.0 --to $(TOOLS_BIN_DIR) --force
-
 .PHONY: serve
-serve: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK) $(MDBOOK_LINKCHECK)
+serve: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK)
 	$(MDBOOK) serve
 
 .PHONY: build
-build: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK) $(MDBOOK_LINKCHECK)
-	$(MDBOOK) build
-
-.PHONY: verify
-verify: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK) $(MDBOOK_LINKCHECK)
+build: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK)
 	$(MDBOOK) build

scripts/ci-build.sh

@@ -21,7 +21,7 @@ set -o pipefail
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # Core Cluster API
-cd "${REPO_ROOT}" && make managers clusterctl e2e-framework
+cd "${REPO_ROOT}" && make managers clusterctl e2e-framework build-book
 
 echo "*** Building Cluster API Provider Docker ***"
 # Docker provider