Skip to content

Commit

Permalink
Default branch rename (#602)
Browse files Browse the repository at this point in the history
* Default branch rename

* Add package.json main branch release config
  • Loading branch information
kfcampbell authored Jan 10, 2023
1 parent 8bc0467 commit 6e115ed
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 11 deletions.
14 changes: 7 additions & 7 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ Resolves #ISSUE_NUMBER
### Before the change?
<!-- Please describe the current behavior that you are modifying. -->

*
*

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

*
*


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

*
*

----

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

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

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

If `Yes`, what's the impact:
If `Yes`, what's the impact:

* N/A


### Pull request type

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

Please add the corresponding label for change this PR introduces:
- Bugfix: `Type: Bug`
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release
"on":
push:
branches:
- master
- main
- beta
- next
- "*.x"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test
"on":
push:
branches:
- master
- main
- dependabot/npm_and_yarn/**
pull_request:
types:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
Make sure to update the commits so that the merge results in helpful
release notes, see [Merging the Pull Request & releasing a new
version](https://github.com/octokit/rest.js/blob/master/CONTRIBUTING.md#merging-the-pull-request--releasing-a-new-version).
version](https://github.com/octokit/rest.js/blob/main/CONTRIBUTING.md#merging-the-pull-request--releasing-a-new-version).
In general
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ npm test

- Create a new branch locally.
- Make your changes in that branch and push them to your fork.
- Submit a pull request from your topic branch to the master branch on the `octokit/plugin-rest-endpoint-methods.js` repository.
- Submit a pull request from your topic branch to the main branch on the `octokit/plugin-rest-endpoint-methods.js` repository.
- 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.

## Testing a pull request from github repo locally:
Expand Down
9 changes: 9 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@
]
},
"release": {
"branches": [
"+([0-9]).x",
"main",
"next",
{
"name": "beta",
"prerelease": true
}
],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
Expand Down

0 comments on commit 6e115ed

Please sign in to comment.