Skip to content

Commit 28c2df9

Browse files
authored
Default branch rename (#494)
1 parent 4a1e66f commit 28c2df9

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

.github/pull_request_template.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ Resolves #ISSUE_NUMBER
1111
### Before the change?
1212
<!-- Please describe the current behavior that you are modifying. -->
1313

14-
*
14+
*
1515

1616
### After the change?
1717
<!-- Please describe the behavior or changes that are being added by this PR. -->
1818

19-
*
19+
*
2020

2121

2222
### Other information
2323
<!-- Any other information that is important to this PR -->
2424

25-
*
25+
*
2626

2727
----
2828

@@ -36,20 +36,20 @@ Resolves #ISSUE_NUMBER
3636
### Does this introduce a breaking change?
3737
<!-- If this introduces a breaking change make sure to note it here any what the impact might be -->
3838

39-
Please see our docs on [breaking changes](https://github.com/octokit/.github/blob/master/community/breaking_changes.md) to help!
39+
Please see our docs on [breaking changes](https://github.com/octokit/.github/blob/main/community/breaking_changes.md) to help!
4040

4141
- [ ] Yes (Please add the `Type: Breaking change` label)
4242
- [ ] No
4343

44-
If `Yes`, what's the impact:
44+
If `Yes`, what's the impact:
4545

4646
* N/A
4747

4848

4949
### Pull request type
5050

51-
<!-- Please do not submit updates to dependencies unless it fixes an issue. -->
52-
<!-- Please try to limit your pull request to one type, submit multiple pull requests if needed. -->
51+
<!-- Please do not submit updates to dependencies unless it fixes an issue. -->
52+
<!-- Please try to limit your pull request to one type, submit multiple pull requests if needed. -->
5353

5454
Please add the corresponding label for change this PR introduces:
5555
- Bugfix: `Type: Bug`

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release
22
"on":
33
push:
44
branches:
5-
- master
5+
- main
66
- next
77
- beta
88
- "*.x"

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Test
22
"on":
33
push:
44
branches:
5-
- master
5+
- main
66
- dependabot/npm_and_yarn/**
77
pull_request:
88
types:

.github/workflows/update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
body: >
3434
Make sure to update the commits so that the merge results in helpful
3535
release notes, see [Merging the Pull Request & releasing a new
36-
version](https://github.com/octokit/rest.js/blob/master/CONTRIBUTING.md#merging-the-pull-request--releasing-a-new-version).
36+
version](https://github.com/octokit/rest.js/blob/main/CONTRIBUTING.md#merging-the-pull-request--releasing-a-new-version).
3737
3838
3939
In general

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ npm test
3939

4040
- Create a new branch locally.
4141
- Make your changes in that branch to your fork repository
42-
- Submit a pull request from your topic branch to the master branch on the `octokit/types.ts` repository.
42+
- Submit a pull request from your topic branch to the main branch on the `octokit/types.ts` repository.
4343
- Be sure to tag any issues your pull request is taking care of / contributing to. Adding "Closes #123" to a pull request description will automatically close the issue once the pull request is merged in.
4444

4545
## Merging the Pull Request & releasing a new version

package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,15 @@
7373
]
7474
},
7575
"release": {
76+
"branches": [
77+
"+([0-9]).x",
78+
"main",
79+
"next",
80+
{
81+
"name": "beta",
82+
"prerelease": true
83+
}
84+
],
7685
"plugins": [
7786
"@semantic-release/commit-analyzer",
7887
"@semantic-release/release-notes-generator",

0 commit comments

Comments
 (0)