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

Fix: Use main as default branch name #156

Merged
merged 1 commit into from
Jun 10, 2020
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://github.com/probot/settings

branches:
- name: "master"
- name: "main"

# https://developer.github.com/v3/repos/branches/#remove-branch-protection
# https://developer.github.com/v3/repos/branches/#update-branch-protection
Expand Down Expand Up @@ -83,7 +83,7 @@ repository:
allow_rebase_merge: false
allow_squash_merge: false
archived: false
default_branch: "master"
default_branch: "main"
delete_branch_on_merge: true
description: ":page_with_curl: Provides a JSON printer, allowing for flexible indentation."
has_downloads: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on: # yamllint disable-line rule:truthy
pull_request: null
push:
branches:
- "master"
- "main"

env:
MIN_COVERED_MSI: 92
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`3.0.2...master`][3.0.2...master].
For a full diff see [`3.0.2...main`][3.0.2...main].

## [`3.0.2`][3.0.2]

Expand Down Expand Up @@ -106,7 +106,7 @@ For a full diff see [`8849fc6...1.0.0`][8849fc6...1.0.0].
[2.0.1...3.0.0]: https://github.com/ergebnis/json-printer/compare/2.0.1...3.0.0
[3.0.0...3.0.1]: https://github.com/ergebnis/json-printer/compare/3.0.0...3.0.1
[3.0.1...3.0.2]: https://github.com/ergebnis/json-printer/compare/3.0.1...3.0.2
[3.0.2...master]: https://github.com/ergebnis/json-printer/compare/3.0.2...master
[3.0.2...main]: https://github.com/ergebnis/json-printer/compare/3.0.2...main

[#33]: https://github.com/ergebnis/json-printer/pull/33
[#37]: https://github.com/ergebnis/json-printer/pull/37
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# json-printer

[![Integrate](https://github.com/ergebnis/json-printer/workflows/Integrate/badge.svg?branch=master)](https://github.com/ergebnis/json-printer/actions)
[![Prune](https://github.com/ergebnis/json-printer/workflows/Prune/badge.svg?branch=master)](https://github.com/ergebnis/json-printer/actions)
[![Release](https://github.com/ergebnis/json-printer/workflows/Release/badge.svg?branch=master)](https://github.com/ergebnis/json-printer/actions)
[![Renew](https://github.com/ergebnis/json-printer/workflows/Renew/badge.svg?branch=master)](https://github.com/ergebnis/json-printer/actions)
[![Integrate](https://github.com/ergebnis/json-printer/workflows/Integrate/badge.svg?branch=main)](https://github.com/ergebnis/json-printer/actions)
[![Prune](https://github.com/ergebnis/json-printer/workflows/Prune/badge.svg?branch=main)](https://github.com/ergebnis/json-printer/actions)
[![Release](https://github.com/ergebnis/json-printer/workflows/Release/badge.svg?branch=main)](https://github.com/ergebnis/json-printer/actions)
[![Renew](https://github.com/ergebnis/json-printer/workflows/Renew/badge.svg?branch=main)](https://github.com/ergebnis/json-printer/actions)

[![Code Coverage](https://codecov.io/gh/ergebnis/json-printer/branch/master/graph/badge.svg)](https://codecov.io/gh/ergebnis/json-printer)
[![Code Coverage](https://codecov.io/gh/ergebnis/json-printer/branch/main/graph/badge.svg)](https://codecov.io/gh/ergebnis/json-printer)
[![Type Coverage](https://shepherd.dev/github/ergebnis/json-printer/coverage.svg)](https://shepherd.dev/github/ergebnis/json-printer)

[![Latest Stable Version](https://poser.pugx.org/ergebnis/json-printer/v/stable)](https://packagist.org/packages/ergebnis/json-printer)
Expand Down Expand Up @@ -84,7 +84,7 @@ Please have a look at [`CONTRIBUTING.md`](.github/CONTRIBUTING.md).

## Code of Conduct

Please have a look at [`CODE_OF_CONDUCT.md`](https://github.com/ergebnis/.github/blob/master/CODE_OF_CONDUCT.md).
Please have a look at [`CODE_OF_CONDUCT.md`](https://github.com/ergebnis/.github/blob/main/CODE_OF_CONDUCT.md).

## License

Expand Down