Merge branch 'master' into develop

DiscordSRV · Jul 2, 2023 · 6239de5 · 6239de5
2 parents 3c15a05 + 184f47f
commit 6239de5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/mkdocs-deploy.yml b/.github/workflows/mkdocs-deploy.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - develop
     paths:
       - '**.md'
       - 'docs/**'
@@ -15,10 +16,18 @@ jobs:
     name: Deploy docs
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout master
-        uses: actions/checkout@v3
-
-      - name: Deploy docs
-        uses: mhausenblas/mkdocs-deploy-gh-pages@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: fregante/setup-git-user@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.x
+      - run: |
+          pip install -r requirements.txt
+          mike deploy -p -u ${GITHUB_REF##*/}
+#      - run: mkdocs build
+#      - uses: actions/upload-pages-artifact@v1
+#        with:
+#          path: 'site'
+#        uses: actions/deploy-pages@v1
diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css
@@ -13,7 +13,7 @@ table code {
     white-space: nowrap
 }
 
-a[href^="http" ]:not(.md-button, [data-sub-html], .md-footer-social__link, .md-source, .md-search-result__link, .md-logo, [href*="config.discordsrv.com"], [href*="squidfunk.github.io"], [href*="Documentation/edit"]):after {
+a[href^="http" ]:not(.md-button, [data-sub-html], .md-footer-social__link, .md-source, .md-search-result__link, .md-logo, .md-version__link, [href*="config.discordsrv.com"], [href*="squidfunk.github.io"], [href*="Documentation/edit"]):after {
     background: transparent var(--external-link-icon) 0 0 no-repeat;
     content: "";
     display: inline-block;

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -87,6 +87,8 @@ markdown_extensions:
       emoji_index: !!python/name:materialx.emoji.twemoji
       emoji_generator: !!python/name:materialx.emoji.to_svg
 extra:
+  version:
+    provider: mike
   project:
     version: 1.26.3-SNAPSHOT
     supported_version:

diff --git a/requirements.txt b/requirements.txt
@@ -10,6 +10,7 @@ Markdown==3.3.4
 -e git+https://github.com/madmpro/Markdown-GridTables@58bf0f7dc85ac077200c9597a1a3c69b6bf63932#egg=Markdown_GridTables
 MarkupSafe==2.0.1
 mergedeep==1.3.4
+mike==1.1.2
 mkdocs==1.4.1
 mkdocs-glightbox==0.3.0
 mkdocs-markdownextradata-plugin==0.2.5
@@ -27,5 +28,6 @@ requests==2.28.1
 six==1.16.0
 soupsieve==2.3.2.post1
 urllib3==1.26.12
+verspec==0.1.0
 watchdog==2.1.3
 zipp==3.4.1