diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a84524a89..51aed7b54 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,6 +11,8 @@ jobs: steps: - name: Checkout latest push uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Setup Python env uses: actions/setup-python@v5 @@ -31,13 +33,15 @@ jobs: git checkout master - name: Install Dependencies - run: make install-python-packages + run: | + make install-python-packages + sudo apt-get install pngquant - name: Install MkDocs Insiders if: github.event.repository.fork == false env: GH_TOKEN: ${{ secrets.GH_TOKEN }} - run: pip install --upgrade git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git@9.4.2-insiders-4.42.0 + run: pip install --upgrade git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git@9.5.15-insiders-4.53.3 - name: Deploy release version run: | diff --git a/Dockerfile b/Dockerfile index 37da260fa..1e290b8f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM squidfunk/mkdocs-material:9.4.2 +FROM squidfunk/mkdocs-material:9.5.15 RUN apk add \ build-base \ libxml2-dev \ diff --git a/Makefile b/Makefile index b83f4b0fe..3cfb3be1f 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,12 @@ install-python-packages: pip install \ "mkdocs-minify-plugin==0.7.1" \ "mkdocs-redirects==1.2.1" \ - "CairoSVG==2.7.1" \ - "jinja2==3.0.3" \ - "mkdocs-static-i18n==1.0.6" \ - "mkdocs-git-committers-plugin-2==1.2.0" \ - "mkdocs-git-revision-date-localized-plugin==1.2.0" + "mkdocs-static-i18n==1.2.2" \ + "mkdocs-git-committers-plugin-2==2.3.0" \ + "mkdocs-git-revision-date-localized-plugin==1.2.4" \ + "cairosvg==2.7.1" \ + "jinja2==3.1.3" + .PHONY: build build: diff --git a/mkdocs-insiders.yml b/mkdocs-insiders.yml index 60155dfc8..5b6e95966 100644 --- a/mkdocs-insiders.yml +++ b/mkdocs-insiders.yml @@ -17,14 +17,15 @@ theme: - toc.follow plugins: - social: - cards_layout: default/accent - cards_layout_options: - background_color: "#00000000" - background_image: layouts/social.png - font_family: Open Sans + # social: + # cards_layout: default/accent + # cards_layout_options: + # background_color: "#00000000" + # background_image: layouts/social.png + # font_family: Open Sans git-committers: enabled: !ENV [CI, false] repository: ExpressLRS/Docs branch: master - + optimize: + enabled: !ENV [CI, false] diff --git a/mkdocs.yml b/mkdocs.yml index 23c889561..016ece8f0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -64,10 +64,9 @@ theme: plugins: search: lang: en - tags: { } + tags: {} minify: minify_html: true - social: i18n: docs_structure: folder fallback_to_default: true @@ -143,8 +142,8 @@ markdown_extensions: - pymdownx.critic - pymdownx.details - pymdownx.emoji: - emoji_index: !!python/name:materialx.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_index: !!python/name:material.extensions.emoji.twemoji + emoji_generator: !!python/name:material.extensions.emoji.to_svg - pymdownx.highlight - pymdownx.inlinehilite - pymdownx.keys @@ -162,8 +161,8 @@ markdown_extensions: - pymdownx.tabbed: alternate_style: true slugify: !!python/object/apply:pymdownx.slugs.slugify - kwds: - case: lower + kwds: + case: lower - pymdownx.tasklist: custom_checkbox: true - pymdownx.tilde