Skip to content

Commit 32a37dd

Browse files
committed
Merge branch 'master' of github.com:squidfunk/mkdocs-material
2 parents 439ece6 + 91bc63c commit 32a37dd

File tree

9 files changed

+4
-97
lines changed

9 files changed

+4
-97
lines changed

docs/publishing-your-site.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,14 @@ contents:
122122
image: python:latest
123123
pages:
124124
stage: deploy
125-
only:
126-
- master # (1)!
127-
- main
128125
script:
129126
- pip install mkdocs-material
130127
- mkdocs build --site-dir public
131128
artifacts:
132129
paths:
133130
- public
131+
rules:
132+
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
134133
```
135134

136135
1. At some point, GitLab renamed `master` to `main`. If your default branch
@@ -142,15 +141,14 @@ contents:
142141
image: python:latest
143142
pages:
144143
stage: deploy
145-
only:
146-
- master
147-
- main
148144
script: # (1)!
149145
- pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
150146
- mkdocs build --site-dir public
151147
artifacts:
152148
paths:
153149
- public
150+
rules:
151+
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
154152
```
155153

156154
1. Remember to set the `GH_TOKEN` environment variable to the value of your

material/.overrides/assets/javascripts/custom.525be7f2.min.js

-18
This file was deleted.

material/.overrides/assets/javascripts/custom.525be7f2.min.js.map

-8
This file was deleted.

material/.overrides/assets/javascripts/iconsearch_index.json

-1
This file was deleted.

material/.overrides/assets/stylesheets/custom.9097afc2.min.css

-1
This file was deleted.

material/.overrides/assets/stylesheets/custom.9097afc2.min.css.map

-1
This file was deleted.

material/.overrides/home.html

-29
This file was deleted.

material/.overrides/main.html

-20
This file was deleted.

material/.overrides/partials/actions.html

-13
This file was deleted.

0 commit comments

Comments
 (0)