From 89c180909713de786c50e18bd3a3b3278861c7ea Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Thu, 17 Feb 2022 07:00:56 +0100 Subject: [PATCH] book: refactor verification MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- Makefile | 10 +++++----- docs/book/Makefile | 4 ---- scripts/ci-build.sh | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index b9d26ad85ade..35aeee645814 100644 --- a/Makefile +++ b/Makefile @@ -314,7 +314,7 @@ tiltfile-fix: ## Format the Tiltfile apidiff: $(GO_APIDIFF) ## Check for API differences $(GO_APIDIFF) $(shell git rev-parse origin/main) --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 @@ -362,10 +362,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 ## -------------------------------------- @@ -433,6 +429,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 diff --git a/docs/book/Makefile b/docs/book/Makefile index 250e5c9e15cf..bd3f10165e4d 100644 --- a/docs/book/Makefile +++ b/docs/book/Makefile @@ -49,7 +49,3 @@ serve: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK) $(MDBOOK_LINKCHECK) .PHONY: build build: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK) $(MDBOOK_LINKCHECK) $(MDBOOK) build - -.PHONY: verify -verify: $(MDBOOK) $(TABULATE) $(EMBED) $(RELEASELINK) $(MDBOOK_LINKCHECK) - $(MDBOOK) build diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 128f5c23ede1..f0c46017b0dc 100755 --- a/scripts/ci-build.sh +++ b/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