Skip to content

Commit

Permalink
Rename default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jonafato committed May 9, 2023
1 parent ad3414a commit d64e8ff
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy To Production
on:
push:
branches:
- master
- main
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ html-prod: link-data
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)

production_push:
cd $(OUTPUTDIR) && git init && git add .
cd $(OUTPUTDIR) && git init --initial-branch main && git add .
cd $(OUTPUTDIR) && git commit --quiet -m "Initial commit"
cd $(OUTPUTDIR) && git remote add origin $(GITHUB_PAGES_REPO)
cd $(OUTPUTDIR) && git push origin master --force
cd $(OUTPUTDIR) && git push origin main --force
echo "Upload complete"

deploy: html-prod production_push

preview_push:
cd $(OUTPUTDIR) && echo "preview.pyvideo.org" > CNAME
cd $(OUTPUTDIR) && git init && git add .
cd $(OUTPUTDIR) && git init --initial-branch main && git add .
cd $(OUTPUTDIR) && git commit -m "Initial commit"
cd $(OUTPUTDIR) && git remote add origin $(PREVIEW_GITHUB_PAGES_REPO)
cd $(OUTPUTDIR) && git push origin master --force
cd $(OUTPUTDIR) && git push origin main --force
echo "Upload complete"

deploy-preview: html preview_push
Expand Down
3 changes: 1 addition & 2 deletions content/pages/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@ PyVideo is maintained by volunteers listed in the `CONTRIBUTORS`_ file.
Questions or concerns regarding the site can be addressed to
`https://gitter.im/pyvideo/pyvideo`_.

.. _`CONTRIBUTORS`: https://github.com/pyvideo/pyvideo/blob/master/CONTRIBUTORS.rst
.. _`CONTRIBUTORS`: https://github.com/pyvideo/pyvideo/blob/main/CONTRIBUTORS.rst
.. _`https://gitter.im/pyvideo/pyvideo`: https://gitter.im/pyvideo/pyvideo
.. _`volunteering wiki page`: https://github.com/pyvideo/pyvideo/wiki/How-to-Volunteer
.. _`Looking to contribute media?`: https://github.com/pyvideo/pyvideo/wiki/How-to-Contribute-Media
.. _`PyVideo.org`: http://pyvideo.org
.. _`GitHub.com`: https://github.com/pyvideo/pyvideo

2 changes: 1 addition & 1 deletion themes/pytube-201601/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ <h3 class="text-muted header__title">
<footer class="footer">
<p>
&copy;
<a href="https://github.com/pyvideo/pyvideo/blob/master/LICENSE">PyVideo.org</a> |
<a href="https://github.com/pyvideo/pyvideo/blob/main/LICENSE">PyVideo.org</a> |
<a href="https://github.com/pyvideo/data/blob/master/LICENSE">pyvideo/data</a>
</p>
</footer>
Expand Down

0 comments on commit d64e8ff

Please sign in to comment.