Skip to content

Commit

Permalink
Merge branch 'master' into docs/social-cards
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed May 8, 2023
2 parents 7050abb + 64bbaff commit 8a8662c
Show file tree
Hide file tree
Showing 13 changed files with 1,047 additions and 728 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: actions/cache@v3
id: cache
with:
key: mkdocs-material-${{ github.sha }}
key: mkdocs-material-${{ github.ref }}
path: .cache
restore-keys: |
mkdocs-material-
Expand Down
11 changes: 7 additions & 4 deletions docs/publishing-your-site.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ contents:
python-version: 3.x
- uses: actions/cache@v3
with:
key: mkdocs-material-${{ github.sha }}
key: mkdocs-material-${{ github.ref }} # (3)!
path: .cache
restore-keys: |
mkdocs-material-
- run: pip install mkdocs-material # (3)!
- run: pip install mkdocs-material # (4)!
- run: mkdocs gh-deploy --force
```

Expand All @@ -53,7 +53,10 @@ contents:
2. At some point, GitHub renamed `master` to `main`. If your default branch
is named `master`, you can safely remove `main`, vice versa.

3. This is the place to install further [MkDocs plugins] or Markdown
3. The `github.ref` property assures that the cache will
update on each pull request merge.

4. This is the place to install further [MkDocs plugins] or Markdown
extensions with `pip` to be used during the build:

``` sh
Expand Down Expand Up @@ -85,7 +88,7 @@ contents:
python-version: 3.x
- uses: actions/cache@v3
with:
key: mkdocs-material-${{ github.sha }}
key: mkdocs-material-${{ github.ref }}
path: .cache
restore-keys: |
mkdocs-material-
Expand Down
1 change: 1 addition & 0 deletions docs/schema/assets/icons.json
Original file line number Diff line number Diff line change
Expand Up @@ -11563,6 +11563,7 @@
"simple/prezi",
"simple/prime",
"simple/primevideo",
"simple/printables",
"simple/prisma",
"simple/prismic",
"simple/privateinternetaccess",
Expand Down
2 changes: 1 addition & 1 deletion docs/setup/ensuring-data-privacy.md
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ carried out. You might want to:
python-version: 3.x
- uses: actions/cache@v3
with:
key: mkdocs-material-${{ github.sha }}
key: mkdocs-material-${{ github.ref }}
path: .cache
restore-keys: |
mkdocs-material-
Expand Down
2 changes: 1 addition & 1 deletion material/.icons/simple/algolia.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions material/.icons/simple/printables.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions material/assets/javascripts/lunr/min/lunr.kn.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions material/assets/javascripts/lunr/min/lunr.sa.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions material/assets/javascripts/lunr/min/lunr.te.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion material/assets/javascripts/lunr/min/lunr.zh.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8a8662c

Please sign in to comment.