From 82c9541fcd671122ed5e97d4de3cd13736591aed Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Fri, 9 Feb 2024 13:21:44 -0700 Subject: [PATCH] ci: docs: try using the woodpecker plugin for mkdocs --- .woodpecker/docs.yml | 34 +++++++++++++++++++--------------- docs/build.sh | 11 +++++------ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index 177e6963..e21d5c69 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -44,21 +44,7 @@ steps: rebuild: "false" restore: "true" - verify-docs: - when: - - evaluate: 'CI_PIPELINE_EVENT == "pull_request"' - image: docker-registry.wezfurlong.org/kumocorp/builder-for-ubuntu:22.04 - pull: true - environment: - CARGO_HOME: .ci-cargo - CARGO_TERM_COLOR: always - commands: - - PATH=$PATH:$HOME/.cargo/bin - - CI=false CARDS=false CHECK_ONLY=1 ./docs/build.sh - build-docs: - when: - - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == "main"' image: docker-registry.wezfurlong.org/kumocorp/builder-for-ubuntu:22.04 pull: true environment: @@ -69,7 +55,25 @@ steps: target: TOKEN commands: - PATH=$PATH:$HOME/.cargo/bin - - CI=true CARDS=true ./docs/build.sh + - CI=true ./docs/build.sh + + run-mkdocs: + image: woodpeckerci/plugin-mkdocs:latest + pull: true + environment: + CARDS: true + settings: + config: mkdocs.yml + pip_install: "mkdocs-macros-plugin,mkdocs-include-markdown-plugin,mkdocs-exclude,mkdocs-git-revision-date-localized-plugin" + + push-docs: + when: + - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == "main"' + image: docker-registry.wezfurlong.org/kumocorp/builder-for-ubuntu:22.04 + secrets: + - source: gh_pages_deploy_token + target: TOKEN + commands: - ./assets/ci/push-gh-pages.sh save-doc-cache: diff --git a/docs/build.sh b/docs/build.sh index d47d5858..1b0bee89 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -51,15 +51,14 @@ if hash black 2>/dev/null ; then black docs/generate-toc.py fi -DOCKER=docker -if hash podman 2>/dev/null ; then - DOCKER=podman +if [ "$CI" == true ] ; then + exit 0 fi -$DOCKER build -t kumomta/mkdocs-material -f docs/Dockerfile . +docker build -t kumomta/mkdocs-material -f docs/Dockerfile . if [ "$SERVE" == "yes" ] ; then - $DOCKER run --rm -it --network=host -v ${PWD}:/docs kumomta/mkdocs-material serve + docker run --rm -it --network=host -v ${PWD}:/docs kumomta/mkdocs-material serve else - $DOCKER run --rm -e CARDS=${CARDS} -v ${PWD}:/docs kumomta/mkdocs-material build + docker run --rm -e CARDS=${CARDS} -v ${PWD}:/docs kumomta/mkdocs-material build fi