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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: rename default branch from master to main #2077

Merged
merged 1 commit into from Apr 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -2,7 +2,7 @@
Thanks for submitting a pull request!

Please make sure you've read and understood our contributing guidelines;
https://github.com/netlify/netlify-cms/blob/master/CONTRIBUTING.md
https://github.com/netlify/netlify-cli/blob/main/CONTRIBUTING.md
Copy link
Member

Choose a reason for hiding this comment

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

馃槺

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, I guess since it's a comment it went unnoticed


If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx", where #xxxx is the issue number.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Expand Up @@ -3,7 +3,7 @@ name: Dependency License Scanning
on:
push:
branches:
- master
- main
- fossa

defaults:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Expand Up @@ -2,9 +2,9 @@ name: Testing for CLI

on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Expand Up @@ -2,7 +2,7 @@ name: release-please
on:
push:
branches:
- master
- main
jobs:
release-please:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-docs.yml
Expand Up @@ -2,9 +2,9 @@ name: Verify Docs

on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -83,7 +83,7 @@ We also test for a few other things:

We actively welcome your pull requests.

1. Fork the repo and create your branch from `master`.
1. Fork the repo and create your branch from `main`.
2. If you've added code that should be tested, add tests.
3. If you've changed APIs, update the documentation.
4. Run `npm test` to run linting, formatting and tests.
Expand All @@ -92,7 +92,7 @@ We actively welcome your pull requests.
## Releasing

1. Merge the release PR
2. Switch to the default branch `git checkout master`
2. Switch to the default branch `git checkout main`
3. Pull latest changes `git pull`
4. Publish the package `npm publish`

Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,11 +1,11 @@
# ![Netlify CLI](cli.png)

[![Coverage Status](https://codecov.io/gh/netlify/cli/branch/master/graph/badge.svg)](https://codecov.io/gh/netlify/cli)
[![Coverage Status](https://codecov.io/gh/netlify/cli/branch/main/graph/badge.svg)](https://codecov.io/gh/netlify/cli)
[![npm version][npm-img]][npm] [![downloads][dl-img]][dl] [![netlify-status][netlify-img]][netlify] [![dependencies][david-img]][david] [![security][snyk-img]][snyk][![FOSSA Status](https://app.fossa.com/api/projects/custom%2B17679%2Fgit%40github.com%3Anetlify%2Fcli.git.svg?type=shield)](https://app.fossa.com/projects/custom%2B17679%2Fgit%40github.com%3Anetlify%2Fcli.git?ref=badge_shield)

Interact with [Netlify](http://netlify.com/) from the comfort of your CLI.

See the [CLI command line reference](https://cli.netlify.com/commands/) to get started and the docs on using [Netlify Dev](https://github.com/netlify/cli/blob/master/docs/netlify-dev.md) to run your site locally.
See the [CLI command line reference](https://cli.netlify.com/commands/) to get started and the docs on using [Netlify Dev](https://github.com/netlify/cli/blob/main/docs/netlify-dev.md) to run your site locally.

## Table of Contents

Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
@@ -1,5 +1,5 @@
codecov:
strict_yaml_branch: master
strict_yaml_branch: main
coverage:
range: [80, 100]
parsers:
Expand Down
4 changes: 2 additions & 2 deletions docs/netlify-dev.md
Expand Up @@ -124,7 +124,7 @@ Netlify Dev is meant to work with zero config for the majority of users, by usin

Netlify Dev will attempt to detect the site generator or build command that you are using, and run these on your behalf, while adding other development utilities. If you have a JavaScript project, it looks for the best `package.json` script to run for you, using simple heuristics, so you can use the full flexibility of npm scripts. We may add more intelligence to this in the future.

**Overriding the detectors**: The number of [project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/master/src/detectors) is growing, but if yours is not yet supported (contributions welcome!), you can instruct Netlify Dev to run the project on your behalf by declaring it in a `[dev]` block of your `netlify.toml` file.
**Overriding the detectors**: The number of [project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/main/src/detectors) is growing, but if yours is not yet supported (contributions welcome!), you can instruct Netlify Dev to run the project on your behalf by declaring it in a `[dev]` block of your `netlify.toml` file.

```toml
# sample dev block in the toml
Expand All @@ -146,7 +146,7 @@ against your project.
```

The `framework` option should be one of the available
[project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/master/src/detectors)
[project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/main/src/detectors)
or `#auto` (default) to test all available detectors, `#static` for a static
file server or `#custom` to use `command` option to run an app server and
`targetPort` option to connect to it.
Expand Down
12 changes: 0 additions & 12 deletions site/src/_layout.js
Expand Up @@ -411,18 +411,6 @@ export default class Layout extends React.Component {
<HitBoxWrapper>
<MyHits />
</HitBoxWrapper>
{/* <EditLink>
<a
style={{
color: '#333',
textDecoration: 'none',
fontSize: '12px'
}}
href={`${repoUrl}/edit/master/docs/${this.props.route.key}`}
>
Edit this doc <GithubIcon/>
</a>
</EditLink> */}
<Wrapper>
<Content>
<div className="doc-content">{children}</div>
Expand Down
2 changes: 1 addition & 1 deletion src/detectors/README.md
Expand Up @@ -18,7 +18,7 @@
## things to note

- Dev block overrides will supercede anything you write in your detector:
https://github.com/netlify/cli/blob/master/docs/netlify-dev.md#project-detection
https://github.com/netlify/cli/blob/main/docs/netlify-dev.md#project-detection
- detectors are language agnostic. don't assume npm or yarn.
- if default args (like 'develop') are missing, that means the user has configured it, best to tell them to use the -c
flag.
Expand Down
2 changes: 1 addition & 1 deletion src/utils/init/utils.js
Expand Up @@ -152,7 +152,7 @@ const getNetlifyToml = ({
# status = 200

## (optional) Settings for Netlify Dev
## https://github.com/netlify/cli/blob/master/docs/netlify-dev.md#project-detection
## https://github.com/netlify/cli/blob/main/docs/netlify-dev.md#project-detection
#[dev]
# command = "yarn start" # Command to start your dev server
# port = 3000 # Port that the dev server will be listening on
Expand Down