Skip to content

Commit

Permalink
switch default branch to main from master
Browse files Browse the repository at this point in the history
  • Loading branch information
dhimmel committed Dec 9, 2020
1 parent b141a33 commit 0c2e5b2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: python -m build --sdist --wheel --outdir=dist
- name: Deploy package
if: '!github.event.repository.fork'
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@v1.4.1
with:
user: __token__
password: ${{ secrets.pypi_password }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
export PYTHONPATH=.
portray as_html --overwrite --output_dir=docs
- name: Deploy docs
if: github.ref == 'refs/heads/master' && github.event_name == 'push' && !github.event.repository.fork
if: github.ref == 'refs/heads/main' && github.event_name == 'push' && !github.event.repository.fork
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=for-the-badge&logo=Python&logoColor=white)](https://github.com/psf/black)

[![GitHub Actions CI Tests Status](https://img.shields.io/github/workflow/status/manubot/manubot/Tests?label=actions&logo=github&style=for-the-badge)](https://github.com/manubot/manubot/actions)
[![Travis Linux Build Status](https://img.shields.io/travis/com/manubot/manubot/master?style=for-the-badge&logo=travis&label=Travis)](https://travis-ci.com/manubot/manubot)
[![AppVeyor Windows Build Status](https://img.shields.io/appveyor/build/manubot/manubot/master?style=for-the-badge&logo=appveyor&logoColor=white&label=AppVeyor)](https://ci.appveyor.com/project/manubot/manubot/branch/master)
[![Travis Linux Build Status](https://img.shields.io/travis/com/manubot/manubot/main?style=for-the-badge&logo=travis&label=Travis)](https://travis-ci.com/manubot/manubot)
[![AppVeyor Windows Build Status](https://img.shields.io/appveyor/build/manubot/manubot/main?style=for-the-badge&logo=appveyor&logoColor=white&label=AppVeyor)](https://ci.appveyor.com/project/manubot/manubot/branch/main)


[Manubot](https://manubot.org/ "Manubot homepage") is a workflow and set of tools for the next generation of scholarly publishing.
Expand Down Expand Up @@ -362,7 +362,7 @@ TAG=v$(python setup.py --version)

# fetch tags from the upstream remote
# (assumes upstream is the manubot organization remote)
git fetch --tags upstream master
git fetch --tags upstream main
# get previous release tag, can hardcode like OLD_TAG=v0.3.1
OLD_TAG=$(git describe --tags --abbrev=0)
```
Expand All @@ -385,7 +385,7 @@ echo $'\n\nCode authors\n------------\n' >> "release-notes/$TAG.md"
git log $OLD_TAG..HEAD --format='%aN <%aE>' | sort --unique >> "release-notes/$TAG.md"
```

After a commit with the above updates is part of `upstream:master`,
After a commit with the above updates is part of `upstream:main`,
for example after a PR is merged,
use the [GitHub interface](https://github.com/manubot/manubot/releases/new) to create a release with the new "Tag version".
Monitor [GitHub Actions](https://github.com/manubot/manubot/actions?query=workflow%3ARelease) and [PyPI](https://pypi.org/project/manubot/#history) for successful deployment of the release.
Expand Down
2 changes: 1 addition & 1 deletion manubot/process/header-includes-template.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Manubot generated metadata rendered from header-includes-template.html.
Suggest improvements at https://github.com/manubot/manubot/blob/master/manubot/process/header-includes-template.html
Suggest improvements at https://github.com/manubot/manubot/blob/main/manubot/process/header-includes-template.html
-->
<meta name="dc.format" content="text/html" />
{% if pandoc.title is defined -%}
Expand Down

0 comments on commit 0c2e5b2

Please sign in to comment.