Skip to content

Commit 6152166

Browse files
authored
Default branch rename (#543)
1 parent fa4cf7f commit 6152166

File tree

6 files changed

+27
-18
lines changed

6 files changed

+27
-18
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/codeql.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ "master" ]
16+
branches: [ "main" ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ "master" ]
19+
branches: [ "main" ]
2020
schedule:
2121
- cron: '30 23 * * 2'
2222

@@ -48,11 +48,11 @@ jobs:
4848
# If you wish to specify custom queries, you can do so here or in a config file.
4949
# By default, queries listed here will override any specified in a config file.
5050
# Prefix the list here with "+" to use these queries and those in the config file.
51-
51+
5252
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5353
# queries: security-extended,security-and-quality
5454

55-
55+
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
@@ -61,7 +61,7 @@ jobs:
6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6363

64-
# If the Autobuild fails above, remove it and uncomment the following three lines.
64+
# If the Autobuild fails above, remove it and uncomment the following three lines.
6565
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
6666

6767
# - run: |

.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
pull_request:
77
types:
88
- opened

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
> Extendable client for GitHub's REST & GraphQL APIs
44
55
[![@latest](https://img.shields.io/npm/v/@octokit/core.svg)](https://www.npmjs.com/package/@octokit/core)
6-
[![Build Status](https://github.com/octokit/core.js/workflows/Test/badge.svg)](https://github.com/octokit/core.js/actions?query=workflow%3ATest+branch%3Amaster)
6+
[![Build Status](https://github.com/octokit/core.js/workflows/Test/badge.svg)](https://github.com/octokit/core.js/actions?query=workflow%3ATest+branch%3Amain)
77

88
<!-- toc -->
99

@@ -33,10 +33,10 @@ If you don't need the Plugin API then using [`@octokit/request`](https://github.
3333
Browsers
3434
</th><td width=100%>
3535
Load <code>@octokit/core</code> directly from <a href="https://cdn.skypack.dev">cdn.skypack.dev</a>
36-
36+
3737
```html
3838
<script type="module">
39-
import { Octokit } from "https://cdn.skypack.dev/@octokit/core";
39+
import { Octokit } from "https://cdn.skypack.dev/@octokit/core";
4040
</script>
4141
```
4242

@@ -166,7 +166,7 @@ octokit.request("POST /repos/{owner}/{repo}/pulls", {
166166
owner,
167167
repo,
168168
title: "My pull request",
169-
base: "master",
169+
base: "main",
170170
head: "my-feature",
171171
draft: true,
172172
});

package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,15 @@
8181
]
8282
},
8383
"release": {
84+
"branches": [
85+
"+([0-9]).x",
86+
"main",
87+
"next",
88+
{
89+
"name": "beta",
90+
"prerelease": true
91+
}
92+
],
8493
"plugins": [
8594
"@semantic-release/commit-analyzer",
8695
"@semantic-release/release-notes-generator",

0 commit comments

Comments
 (0)