From 09fa43356d0b7e9d05d7ed33707224e206b75de5 Mon Sep 17 00:00:00 2001 From: Alessandro De Maria Date: Sat, 11 Nov 2023 12:09:12 +0000 Subject: [PATCH 1/2] Fix docs --- .github/workflows/documentation.yml | 12 +++++++++++- mkdocs.yml | 2 +- requirements.docs.txt | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 78cc8d97c..0f411d7ed 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -6,6 +6,13 @@ concurrency: cancel-in-progress: true on: + pull_request: + paths: + - 'docs/**' + - 'requirements.docs.txt' + - 'Dockerfile.docs' + - 'mkdocs.yml' + - 'CNAME' push: branches: - master @@ -22,8 +29,11 @@ jobs: steps: - name: Checkout kapitan recursively uses: actions/checkout@v4 - + - uses: actions/setup-python@v2 + - run: pip install --upgrade pip && pip install -r requirements.docs.txt + - run: mkdocs build - name: Deploy docs + if: github.event_name != 'pull_request' && github.ref == github.event.repository.default_branch uses: mhausenblas/mkdocs-deploy-gh-pages@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/mkdocs.yml b/mkdocs.yml index d059deaa1..4a59c8d19 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -153,7 +153,7 @@ markdown_extensions: base_path: examples - pymdownx.emoji: emoji_index: !!python/name:material.extensions.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_generator: !!python/name:material.extensions.emoji.to_svg options: custom_icons: - overrides/.icons diff --git a/requirements.docs.txt b/requirements.docs.txt index 8ff9e5146..7ced90ccb 100644 --- a/requirements.docs.txt +++ b/requirements.docs.txt @@ -1,5 +1,5 @@ markdown-include==0.8.1 mkdocs-material-extensions==1.3 -mkdocs-material==9.3.1 -mkdocs==1.5.2 -pymdown-extensions==10.3 +mkdocs-material==9.4.8 +mkdocs==1.5.3 +pymdown-extensions==10.4 From 466ee1f81c73a63e3f0837988650ddb79d476a5d Mon Sep 17 00:00:00 2001 From: Alessandro De Maria Date: Sat, 11 Nov 2023 12:12:02 +0000 Subject: [PATCH 2/2] fix exclusions --- .github/workflows/documentation.yml | 2 ++ .github/workflows/test-build-publish.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 0f411d7ed..bedfafb57 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,6 +9,7 @@ on: pull_request: paths: - 'docs/**' + - '.github/worklows/documentation.yml' - 'requirements.docs.txt' - 'Dockerfile.docs' - 'mkdocs.yml' @@ -18,6 +19,7 @@ on: - master paths: - 'docs/**' + - '.github/worklows/documentation.yml' - 'requirements.docs.txt' - 'Dockerfile.docs' - 'mkdocs.yml' diff --git a/.github/workflows/test-build-publish.yml b/.github/workflows/test-build-publish.yml index 346e91835..49566df55 100644 --- a/.github/workflows/test-build-publish.yml +++ b/.github/workflows/test-build-publish.yml @@ -14,6 +14,7 @@ on: - test/* paths-ignore: - 'docs/**' + - '.github/worklows/documentation.yml' - 'requirements.docs.txt' - 'mkdocs.yml' - 'CNAME' @@ -25,6 +26,7 @@ on: pull_request: paths-ignore: - 'docs/**' + - '.github/worklows/documentation.yml' - 'requirements.docs.txt' - 'mkdocs.yml' - 'CNAME'