Skip to content
Permalink
Browse files
Chore: migrate master to main (#15062)
* Chore: migrate master to main

* fix: keep the branch name to master for website repo

Co-authored-by: Milos Djermanovic <milos.djermanovic@gmail.com>

* Fix: replace main branch in URL with HEAD

* Fix: add both master and main branch in Github workflow

Co-authored-by: Jordan Harband <ljharb@gmail.com>

* Fix: make the branch name to main for edit url

Co-authored-by: Milos Djermanovic <milos.djermanovic@gmail.com>
Co-authored-by: Jordan Harband <ljharb@gmail.com>
  • Loading branch information
3 people committed Oct 15, 2021
1 parent ec0f8e0 commit dd58cd4afa6ced9016c091fc99a702c97a3e44f0
@@ -6,7 +6,7 @@

#### Prerequisites checklist

- [ ] I have read the [contributing guidelines](https://github.com/eslint/eslint/blob/master/CONTRIBUTING.md).
- [ ] I have read the [contributing guidelines](https://github.com/eslint/eslint/blob/HEAD/CONTRIBUTING.md).

#### What is the purpose of this pull request? (put an "X" next to an item)

@@ -16,9 +16,9 @@
-->

[ ] Documentation update
[ ] Bug fix ([template](https://raw.githubusercontent.com/eslint/eslint/master/templates/bug-report.md))
[ ] New rule ([template](https://raw.githubusercontent.com/eslint/eslint/master/templates/rule-proposal.md))
[ ] Changes an existing rule ([template](https://raw.githubusercontent.com/eslint/eslint/master/templates/rule-change-proposal.md))
[ ] Bug fix ([template](https://raw.githubusercontent.com/eslint/eslint/HEAD/templates/bug-report.md))
[ ] New rule ([template](https://raw.githubusercontent.com/eslint/eslint/HEAD/templates/rule-proposal.md))
[ ] Changes an existing rule ([template](https://raw.githubusercontent.com/eslint/eslint/HEAD/templates/rule-change-proposal.md))
[ ] Add autofixing to a rule
[ ] Add a CLI option
[ ] Add something to the core
@@ -1,9 +1,9 @@
name: CI
on:
push:
branches: [master]
branches: [master, main]
pull_request:
branches: [master]
branches: [master, main]

jobs:
verify_files:
@@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master ]
branches: [master, main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [master, main]
schedule:
- cron: '28 17 * * 5'

@@ -647,8 +647,8 @@ target.gensite = function(prereleaseVersion) {
tempFiles.forEach((filename, i) => {
if (test("-f", filename) && path.extname(filename) === ".md") {

const rulesUrl = "https://github.com/eslint/eslint/tree/master/lib/rules/",
docsUrl = "https://github.com/eslint/eslint/tree/master/docs/rules/",
const rulesUrl = "https://github.com/eslint/eslint/tree/HEAD/lib/rules/",
docsUrl = "https://github.com/eslint/eslint/tree/HEAD/docs/rules/",
baseName = path.basename(filename),
sourceBaseName = `${path.basename(filename, ".md")}.js`,
sourcePath = path.join("lib/rules", sourceBaseName),
@@ -695,7 +695,7 @@ target.gensite = function(prereleaseVersion) {
"---",
`title: ${title}`,
"layout: doc",
`edit_link: https://github.com/eslint/eslint/edit/master/${filePath}`,
`edit_link: https://github.com/eslint/eslint/edit/main/${filePath}`,
ruleType,
"---",
"<!-- Note: No pull requests accepted for this file. See README.md in the root directory for details. -->",
@@ -226,9 +226,9 @@ module.exports = function(context) {
```

See Also:
[no-unreachable](https://github.com/eslint/eslint/blob/master/lib/rules/no-unreachable.js),
[no-fallthrough](https://github.com/eslint/eslint/blob/master/lib/rules/no-fallthrough.js),
[consistent-return](https://github.com/eslint/eslint/blob/master/lib/rules/consistent-return.js)
[no-unreachable](https://github.com/eslint/eslint/blob/HEAD/lib/rules/no-unreachable.js),
[no-fallthrough](https://github.com/eslint/eslint/blob/HEAD/lib/rules/no-fallthrough.js),
[consistent-return](https://github.com/eslint/eslint/blob/HEAD/lib/rules/consistent-return.js)

### To check state of a code path

@@ -324,8 +324,8 @@ module.exports = function(context) {
```

See Also:
[constructor-super](https://github.com/eslint/eslint/blob/master/lib/rules/constructor-super.js),
[no-this-before-super](https://github.com/eslint/eslint/blob/master/lib/rules/no-this-before-super.js)
[constructor-super](https://github.com/eslint/eslint/blob/HEAD/lib/rules/constructor-super.js),
[no-this-before-super](https://github.com/eslint/eslint/blob/HEAD/lib/rules/no-this-before-super.js)

## Code Path Examples

@@ -88,7 +88,7 @@ Before you send the pull request, be sure to rebase onto the upstream source. Th

```
git fetch upstream
git rebase upstream/master
git rebase upstream/main
```

### Step 4: Run the tests<a name="step4"></a>
@@ -164,15 +164,15 @@ $ git commit
$ git push origin issue1234
```

When updating the code, it's usually better to add additional commits to your branch rather than amending the original commit, because reviewers can easily tell which changes were made in response to a particular review. When we merge pull requests, we will squash all the commits from your branch into a single commit on the `master` branch.
When updating the code, it's usually better to add additional commits to your branch rather than amending the original commit, because reviewers can easily tell which changes were made in response to a particular review. When we merge pull requests, we will squash all the commits from your branch into a single commit on the `main` branch.

### Rebasing

If your code is out-of-date, we might ask you to rebase. That means we want you to apply your changes on top of the latest upstream code. Make sure you have set up a [development environment](../development-environment.md) and then you can rebase using these commands:

```
$ git fetch upstream
$ git rebase upstream/master
$ git rebase upstream/main
```

You might find that there are merge conflicts when you attempt to rebase. Please [resolve the conflicts](https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/) and then do a forced push to your branch:
@@ -493,8 +493,8 @@ To keep the linting process efficient and unobtrusive, it is useful to verify th
The `npm run perf` command gives a high-level overview of ESLint running time with default rules (`eslint:recommended`) enabled.

```bash
$ git checkout master
Switched to branch 'master'
$ git checkout main
Switched to branch 'main'
$ npm run perf
CPU Speed is 2200 with multiplier 7500000
@@ -695,8 +695,8 @@ To keep the linting process efficient and unobtrusive, it is useful to verify th
When developing in the ESLint core repository, the `npm run perf` command gives a high-level overview of ESLint running time with all core rules enabled.

```bash
$ git checkout master
Switched to branch 'master'
$ git checkout main
Switched to branch 'main'
$ npm run perf
CPU Speed is 2200 with multiplier 7500000

0 comments on commit dd58cd4

Please sign in to comment.