Merge pull request #2854 from ncdc/fix-docs

🌱 docs: fix venv
kcp-dev · Mar 1, 2023 · 5d34d08 · 5d34d08
2 parents 424d767 + d5466d1
commit 5d34d08
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/docs-gen-and-push.yaml b/.github/workflows/docs-gen-and-push.yaml
@@ -39,7 +39,6 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-          # Temporarily turn off caching to see if that fixes CI
-          #cache: 'pip'
+          cache: 'pip'
 
       - run: make generate-cli-docs generate-api-docs deploy-docs
diff --git a/Makefile b/Makefile
@@ -170,13 +170,16 @@ generate-api-docs:
 
 VENVDIR=$(abspath docs/venv)
 REQUIREMENTS_TXT=docs/requirements.txt
+
 .PHONY: serve-docs
 serve-docs: venv
+	. $(VENV)/activate; \
 	VENV=$(VENV) REMOTE=$(REMOTE) BRANCH=$(BRANCH) hack/serve-docs.sh
 
 .PHONY: deploy-docs
 deploy-docs: venv
-	VENV=$(VENV) REMOTE=$(REMOTE) BRANCH=$(BRANCH) hack/deploy-docs.sh
+	. $(VENV)/activate; \
+	REMOTE=$(REMOTE) BRANCH=$(BRANCH) hack/deploy-docs.sh
 
 vendor: ## Vendor the dependencies
 	go mod tidy

diff --git a/hack/deploy-docs.sh b/hack/deploy-docs.sh
@@ -51,4 +51,4 @@ if [[ -n "${CI:-}" ]]; then
   git config user.email no-reply@kcp.io
 fi
 
-"$VENV"/mike deploy "${MIKE_OPTIONS[@]}" "$VERSION"
+mike deploy "${MIKE_OPTIONS[@]}" "$VERSION"
diff --git a/hack/serve-docs.sh b/hack/serve-docs.sh
@@ -31,4 +31,4 @@ if [[ -n "${BRANCH:-}" ]]; then
   MIKE_OPTIONS+=(--branch "$BRANCH")
 fi
 
-"$VENV"/mike serve "${MIKE_OPTIONS[@]}"
+mike serve "${MIKE_OPTIONS[@]}"