Skip to content

Commit 391a608

Browse files
committed
Rename default branch to main
I've removed the `workflow_dispatch` trigger from `update-changelog.yaml` as the `workflow_dispatch` event does not have the release details in its payload so I doubt this would run successfully.
1 parent 4d9951c commit 391a608

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/update-changelog.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# This workflow takes the GitHub release notes an updates the changelog on the
2-
# master branch with the body of the release notes, thereby keeping a log in
2+
# main branch with the body of the release notes, thereby keeping a log in
33
# the git repo of the changes.
44

55
name: "Update Changelog"
66

77
on:
8-
workflow_dispatch:
98
release:
109
types: [released]
1110

@@ -17,7 +16,7 @@ jobs:
1716
- name: Checkout code
1817
uses: actions/checkout@v2
1918
with:
20-
ref: master
19+
ref: main
2120

2221
- name: Update Changelog
2322
uses: stefanzweifel/changelog-updater-action@v1
@@ -29,6 +28,6 @@ jobs:
2928
- name: Commit updated CHANGELOG
3029
uses: stefanzweifel/git-auto-commit-action@v4
3130
with:
32-
branch: master
31+
branch: main
3332
commit_message: Update CHANGELOG
3433
file_pattern: CHANGES.md

RELEASING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
To make a new release of pytest-mpl follow the following steps:
44

5-
* Ensure the sdist and wheel GitHub Actions jobs succeeded on master after the last merge.
5+
* Ensure the sdist and wheel GitHub Actions jobs succeeded on main after the last merge.
66
* Also ensure that the tarball built has an autogenerated version number from setuptools_scm.
77
* Write the release notes in the GitHub releases UI, use the autogenerated
88
notes and tidy up a little.
99
* Publish the new release, using the format `vX.Y.X`.
10-
* Watch as GitHub actions builds the sdist and universal wheel and pushes them to PyPI for you, and updates CHANGES.md on the master branch.
10+
* Watch as GitHub actions builds the sdist and universal wheel and pushes them to PyPI for you, and updates CHANGES.md on the main branch.
1111
* Enjoy the beverage of your choosing 🍻.

0 commit comments

Comments
 (0)