Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Use correct branch as the basis for deploying the docs #559

Merged
merged 4 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Docs

on:
pull_request:
branches: ['master']
branches: ['main']
paths:
- 'docs/**/*'
- 'mkdocs.yml'

push:
branches: ['master']
branches: ['main']
paths:
- 'docs/**/*'
- 'mkdocs.yml'
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:

deploy:
needs: build
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

This is the main website for torchbox.com, built on the [Wagtail CMS](https://wagtail.org/).

To start working on this project, please refer to the README.
To start working on this project, please refer to the [README](https://github.com/torchbox/wagtail-torchbox/blob/main/README.md).

## External integrations

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
site_name: Torchbox
repo_url: https://github.com/torchbox/wagtail-torchbox
site_url:
edit_uri: 'edit/master/docs/'
edit_uri: 'edit/main/docs/'

repo_name: Github
dev_addr: 0.0.0.0:8001
Expand Down