Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: migrate master to main #15062

Merged
merged 5 commits into from Oct 15, 2021
Merged

Chore: migrate master to main #15062

merged 5 commits into from Oct 15, 2021

Conversation

niteshseram
Copy link
Contributor

@niteshseram niteshseram commented Sep 14, 2021

Prerequisites checklist

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

[ ] Documentation update
[ ] Bug fix (template)
[ ] New rule (template)
[ ] Changes an existing rule (template)
[ ] Add autofixing to a rule
[ ] Add a CLI option
[ ] Add something to the core
[X] Other, please explain:
Migrate branch from master to main

What changes did you make? (Give an overview)

I have updated the occurrence of word master to main in GitHub action, Makefile.js and some docs
Closes #15042

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Sep 14, 2021

CLA Signed

The committers are authorized under a signed CLA.

@eslint-github-bot eslint-github-bot bot added the triage An ESLint team member will look at this issue soon label Sep 14, 2021
@eslint-github-bot
Copy link

eslint-github-bot bot commented Sep 14, 2021

Hi @niteshseram!, thanks for the Pull Request

The first commit message isn't properly formatted. We ask that you update the message to match this format, as we use it to generate changelogs and automate releases.

  • The commit message tag must be one of the following:

    The Tag is one of the following:

    • Fix - for a bug fix.
    • Update - either for a backwards-compatible enhancement or for a rule change that adds reported problems.
    • New - implements a new feature.
    • Breaking - for a backwards-incompatible enhancement or feature.
    • Docs - changes to documentation only.
    • Build - changes to build process only.
    • Upgrade - for a dependency upgrade.
    • Chore - for anything that isn't user-facing (for example, refactoring, adding tests, etc.).

    You can use the labels of the issue you are working on to determine the best tag.

  • There should be a space following the initial tag and colon, for example 'New: Message'.

  • The first letter of the tag should be in uppercase

Read more about contributing to ESLint here

@niteshseram niteshseram changed the title chore: migrate master to main Chore: migrate master to main Sep 14, 2021
@eslint-github-bot
Copy link

eslint-github-bot bot commented Sep 14, 2021

Hi @niteshseram!, thanks for the Pull Request

The first commit message isn't properly formatted. We ask that you update the message to match this format, as we use it to generate changelogs and automate releases.

  • The commit message tag must be one of the following:

    The Tag is one of the following:

    • Fix - for a bug fix.
    • Update - either for a backwards-compatible enhancement or for a rule change that adds reported problems.
    • New - implements a new feature.
    • Breaking - for a backwards-incompatible enhancement or feature.
    • Docs - changes to documentation only.
    • Build - changes to build process only.
    • Upgrade - for a dependency upgrade.
    • Chore - for anything that isn't user-facing (for example, refactoring, adding tests, etc.).

    You can use the labels of the issue you are working on to determine the best tag.

  • There should be a space following the initial tag and colon, for example 'New: Message'.

  • The first letter of the tag should be in uppercase

Read more about contributing to ESLint here

@mdjermanovic mdjermanovic added accepted There is consensus among the team that this change meets the criteria for inclusion infrastructure Relates to the tools used in the ESLint development process and removed triage An ESLint team member will look at this issue soon labels Sep 14, 2021
Makefile.js Outdated Show resolved Hide resolved
Makefile.js Outdated Show resolved Hide resolved
Co-authored-by: Milos Djermanovic <milos.djermanovic@gmail.com>
@@ -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/main/CONTRIBUTING.md).
Copy link
Sponsor Contributor

@ljharb ljharb Sep 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

this way it will always work, now and later, and won't need to be coordinated with the default branch change.

Same for every URL in the PR.

Copy link
Contributor Author

@niteshseram niteshseram Sep 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review @ljharb. I made the changes in all the URLs.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/codeql-analysis.yml Outdated Show resolved Hide resolved
.github/workflows/codeql-analysis.yml Outdated Show resolved Hide resolved
Co-authored-by: Jordan Harband <ljharb@gmail.com>
nzakas
nzakas approved these changes Sep 16, 2021
Copy link
Member

@nzakas nzakas left a comment

Nice! Thanks for doing this. We will have to coordinate renaming the master branch with merging this PR.

@ljharb
Copy link
Sponsor Contributor

ljharb commented Sep 16, 2021

@nzakas the way it’s written, you don’t - you can merge this, and only the instructions will be wrong until you change the branch.

@nzakas
Copy link
Member

nzakas commented Sep 16, 2021

@ljharb good point! I'll just wait for @mdjermanovic to ensure his concerns were addressed.

Makefile.js Outdated Show resolved Hide resolved
nzakas
nzakas approved these changes Sep 21, 2021
Copy link
Member

@mdjermanovic mdjermanovic left a comment

LGTM, thanks!

@mdjermanovic
Copy link
Member

mdjermanovic commented Sep 21, 2021

It seems that GitHub does not redirect edit/master links to edit/main links.

This is a link to update one document in eslint/espree (which was switched from master to main):

https://github.com/eslint/espree/edit/main/docs/tokens.md

But it doesn't redirect the same link with master:

https://github.com/eslint/espree/edit/master/docs/tokens.md

So, we'll have to update all edit links manually in eslint/website when we switch eslint/eslint to main. Otherwise, they will be broken until the final ESLint v8.0.0 release overwrites them.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
accepted There is consensus among the team that this change meets the criteria for inclusion archived due to age This issue has been archived; please open a new issue for any further discussion infrastructure Relates to the tools used in the ESLint development process
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch primary branch to main
4 participants