Merge remote-tracking branch 'upstream/main' into conduwuit-changes
This commit is contained in:
commit
3b104d47e3
@ -1,5 +1,6 @@
|
||||
# https://embarkstudios.github.io/cargo-deny/checks/cfg.html
|
||||
|
||||
[graph]
|
||||
all-features = true
|
||||
exclude = [
|
||||
# dev only dependency
|
||||
|
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -245,10 +245,10 @@ jobs:
|
||||
|
||||
- name: Upload docs as pages artifact
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
uses: actions/upload-pages-artifact@v3
|
||||
uses: actions/upload-pages-artifact@v1
|
||||
with:
|
||||
path: target/doc
|
||||
|
||||
- name: Deploy to GitHub Pages
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
uses: actions/deploy-pages@v4
|
||||
uses: actions/deploy-pages@v2
|
||||
|
Loading…
x
Reference in New Issue
Block a user