Skip to content

Commit 9cebfd7

Browse files
authored
chore: rename master branch references to main (#589)
Closes: #582
1 parent baa3a37 commit 9cebfd7

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 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: '42 12 * * 1'
2222

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
8484
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
8585
needs: [build, test]
86-
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta')
86+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta')
8787
steps:
8888
- uses: actions/checkout@v1
8989

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Here is a summary of the steps to follow:
5757
2. If you cloned a while ago, get the latest changes from upstream and update dependencies:
5858

5959
```bash
60-
$ git checkout master
61-
$ git pull upstream master
60+
$ git checkout main
61+
$ git pull upstream main
6262
$ yarn install
6363
```
6464

@@ -75,7 +75,7 @@ $ git checkout -b <topic-branch-name>
7575
$ git push origin <topic-branch-name>
7676
```
7777

78-
6. [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request/#creating-the-pull-request) to the `master` branch with a clear title and description.
78+
6. [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request/#creating-the-pull-request) to the `main` branch with a clear title and description.
7979

8080
**Tips**:
8181

@@ -217,5 +217,5 @@ otherwise use **rebase and merge**.
217217

218218
### Releasing a stable version
219219

220-
Fixes and tested features from the `beta` branch can be merged with the `master` branch. Please ensure your branch is
221-
up to date with the `master` and then [open a Pull Request](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/compare/master...).
220+
Fixes and tested features from the `beta` branch can be merged with the `main` branch. Please ensure your branch is
221+
up to date with the `main` and then [open a Pull Request](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/compare/main...).

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<p>Webpack plugin that runs TypeScript type checker on a separate process.</p>
55

66
[![npm version](https://img.shields.io/npm/v/fork-ts-checker-webpack-plugin.svg)](https://www.npmjs.com/package/fork-ts-checker-webpack-plugin)
7-
[![build status](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/workflows/CI/CD/badge.svg?branch=master&event=push)](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/actions?query=branch%3Amaster+event%3Apush)
7+
[![build status](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/workflows/CI/CD/badge.svg?branch=main&event=push)](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/actions?query=branch%3Amain+event%3Apush)
88
[![downloads](http://img.shields.io/npm/dm/fork-ts-checker-webpack-plugin.svg)](https://npmjs.org/package/fork-ts-checker-webpack-plugin)
99
[![commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
1010
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)

release.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
branches: [
3-
'master',
3+
'main',
44
{
55
name: 'alpha',
66
prerelease: true,

src/formatter/types/babel__code-frame.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Base on the type definitions for @babel/code-frame 7.0
2-
// Project: https://github.com/babel/babel/tree/master/packages/babel-code-frame, https://babeljs.io
2+
// Project: https://github.com/babel/babel/tree/main/packages/babel-code-frame, https://babeljs.io
33
// Definitions by: Mohsen Azimi <https://github.com/mohsen1>
44
// Forbes Lindesay <https://github.com/ForbesLindesay>
55
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

0 commit comments

Comments
 (0)