Skip to content

Commit e89d315

Browse files
MichaelDeBoeyMichaelDeBoey
committed
chore(CI): update master branch references
1 parent 57dac84 commit e89d315

File tree

6 files changed

+72
-72
lines changed

6 files changed

+72
-72
lines changed

‎.github/workflows/CI.yml

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
name: CI
22
on:
33
push:
4-
branches: [master, gha]
4+
branches: [main, gha]
55
pull_request:
6-
branches: [master]
6+
branches: [main]
77
schedule:
8-
- cron: 0 0 * * 0
8+
- cron: 0 0 * * 0
99

1010
jobs:
1111
lint:
1212
name: Lint
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Checkout
16-
uses: actions/checkout@v2
17-
- name: Install Node.js
18-
uses: actions/setup-node@v1
19-
with: { node-version: 14.x }
20-
- name: Install Packages
21-
run: npm install
22-
- name: Lint
23-
run: npm run -s lint
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Install Node.js
18+
uses: actions/setup-node@v1
19+
with: { node-version: 14.x }
20+
- name: Install Packages
21+
run: npm install
22+
- name: Lint
23+
run: npm run -s lint
2424

2525
test:
2626
name: Test
@@ -30,48 +30,48 @@ jobs:
3030
node: [14.x]
3131
os: [ubuntu-latest]
3232
include:
33-
# On other platforms
34-
- eslint: 7.x
35-
node: 14.x
36-
os: windows-latest
37-
- eslint: 7.x
38-
node: 14.x
39-
os: macos-latest
40-
# On old Node.js versions
41-
- eslint: 7.x
42-
node: 12.x
43-
os: ubuntu-latest
44-
- eslint: 7.x
45-
node: 10.x
46-
os: ubuntu-latest
47-
- eslint: 6.x
48-
node: 8.x
49-
os: ubuntu-latest
50-
- eslint: 5.x
51-
node: 6.x
52-
os: ubuntu-latest
53-
# On the minimum supported ESLint/Node.js version
54-
- eslint: "4.19.1"
55-
node: "6.5.0"
56-
os: ubuntu-latest
33+
# On other platforms
34+
- eslint: 7.x
35+
node: 14.x
36+
os: windows-latest
37+
- eslint: 7.x
38+
node: 14.x
39+
os: macos-latest
40+
# On old Node.js versions
41+
- eslint: 7.x
42+
node: 12.x
43+
os: ubuntu-latest
44+
- eslint: 7.x
45+
node: 10.x
46+
os: ubuntu-latest
47+
- eslint: 6.x
48+
node: 8.x
49+
os: ubuntu-latest
50+
- eslint: 5.x
51+
node: 6.x
52+
os: ubuntu-latest
53+
# On the minimum supported ESLint/Node.js version
54+
- eslint: "4.19.1"
55+
node: "6.5.0"
56+
os: ubuntu-latest
5757

5858
runs-on: ${{ matrix.os }}
5959
steps:
60-
- name: Checkout
61-
uses: actions/checkout@v2
62-
- name: Install Node.js ${{ matrix.node }}
63-
uses: actions/setup-node@v1
64-
with: { node-version: "${{ matrix.node }}" }
65-
- name: Install npm 6.x
66-
run: npm install --global [email protected]
67-
if: ${{ matrix.node == '6.x' || matrix.node == '6.5.0' }}
68-
- name: Install Packages
69-
run: npm install
70-
- name: Install ESLint ${{ matrix.eslint }}
71-
run: npm install --no-save eslint@${{ matrix.eslint }}
72-
- name: Test
73-
run: npm run -s test:ci
74-
- name: Send Coverage
75-
run: npm run -s codecov
76-
env:
77-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
60+
- name: Checkout
61+
uses: actions/checkout@v2
62+
- name: Install Node.js ${{ matrix.node }}
63+
uses: actions/setup-node@v1
64+
with: { node-version: "${{ matrix.node }}" }
65+
- name: Install npm 6.x
66+
run: npm install --global [email protected]
67+
if: ${{ matrix.node == '6.x' || matrix.node == '6.5.0' }}
68+
- name: Install Packages
69+
run: npm install
70+
- name: Install ESLint ${{ matrix.eslint }}
71+
run: npm install --no-save eslint@${{ matrix.eslint }}
72+
- name: Test
73+
run: npm run -s test:ci
74+
- name: Send Coverage
75+
run: npm run -s codecov
76+
env:
77+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/Website.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
name: Website
22
on:
33
push:
4-
branches: [master]
4+
branches: [main]
55

66
jobs:
77
build:
88
name: Build
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v2
13-
- name: Install Node.js
14-
uses: actions/setup-node@v1
15-
with: { node-version: 14.x }
16-
- name: Install Packages
17-
run: npm install
18-
- name: Build Website
19-
run: npm run -s docs:build
20-
- name: Deploy Website
21-
run: npm run -s docs:deploy -- $GITHUB_TOKEN
22-
env:
23-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
- name: Install Node.js
14+
uses: actions/setup-node@v1
15+
with: { node-version: 14.x }
16+
- name: Install Packages
17+
run: npm install
18+
- name: Build Website
19+
run: npm run -s docs:build
20+
- name: Deploy Website
21+
run: npm run -s docs:deploy -- $GITHUB_TOKEN
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![npm version](https://img.shields.io/npm/v/eslint-plugin-eslint-comments.svg)](https://www.npmjs.com/package/eslint-plugin-eslint-comments)
44
[![Downloads/month](https://img.shields.io/npm/dm/eslint-plugin-eslint-comments.svg)](http://www.npmtrends.com/eslint-plugin-eslint-comments)
55
[![Build Status](https://github.com/mysticatea/eslint-plugin-eslint-comments/workflows/CI/badge.svg)](https://github.com/mysticatea/eslint-plugin-eslint-comments/actions)
6-
[![codecov](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments/branch/master/graph/badge.svg)](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments)
6+
[![codecov](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments/branch/main/graph/badge.svg)](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments)
77
[![Dependency Status](https://david-dm.org/mysticatea/eslint-plugin-eslint-comments.svg)](https://david-dm.org/mysticatea/eslint-plugin-eslint-comments)
88

99
Additional ESLint rules for ESLint directive comments (e.g. `//eslint-disable-line`).

‎docs/.vuepress/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
repo: "mysticatea/eslint-plugin-eslint-comments",
1919
docsRepo: "mysticatea/eslint-plugin-eslint-comments",
2020
docsDir: "docs",
21-
docsBranch: "master",
21+
docsBranch: "main",
2222
editLinks: true,
2323
search: false,
2424

‎docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![npm version](https://img.shields.io/npm/v/eslint-plugin-eslint-comments.svg)](https://www.npmjs.com/package/eslint-plugin-eslint-comments)
44
[![Downloads/month](https://img.shields.io/npm/dm/eslint-plugin-eslint-comments.svg)](http://www.npmtrends.com/eslint-plugin-eslint-comments)
55
[![Build Status](https://github.com/mysticatea/eslint-plugin-eslint-comments/workflows/CI/badge.svg)](https://github.com/mysticatea/eslint-plugin-eslint-comments/actions)
6-
[![codecov](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments/branch/master/graph/badge.svg)](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments)
6+
[![codecov](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments/branch/main/graph/badge.svg)](https://codecov.io/gh/mysticatea/eslint-plugin-eslint-comments)
77
[![Dependency Status](https://david-dm.org/mysticatea/eslint-plugin-eslint-comments.svg)](https://david-dm.org/mysticatea/eslint-plugin-eslint-comments)
88

99
Additional ESLint rules for ESLint directive comments (e.g. `//eslint-disable-line`).

‎docs/rules/require-description.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ You can specify ignored directive-comments.
6060

6161
- [ESLint RFCs - Description in directive comments]
6262

63-
[ESLint RFCs - Description in directive comments]: https://github.com/eslint/rfcs/blob/master/designs/2019-description-in-directive-comments/README.md
63+
[ESLint RFCs - Description in directive comments]: https://github.com/eslint/rfcs/blob/main/designs/2019-description-in-directive-comments/README.md

0 commit comments

Comments
 (0)