Skip to content
This repository has been archived by the owner on Jan 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #250 from ergebnis/fix/rename
Browse files Browse the repository at this point in the history
Fix: Use main as default branch name
  • Loading branch information
localheinz authored Jun 10, 2020
2 parents 2abf640 + 89c2be7 commit c83d674
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
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: ":eyeglasses: Provides utilities for tests."
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: 95
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 [`1.0.0...master`][1.0.0...master].
For a full diff see [`1.0.0...main`][1.0.0...main].

## [`1.0.0`][1.0.0]

Expand Down Expand Up @@ -78,7 +78,7 @@ For a full diff see [`0.7.0...0.8.0`][0.7.0...0.8.0].
[0.8.0...0.9.0]: https://github.com/ergebnis/test-util/compare/0.8.0...0.9.0
[0.9.0...0.9.1]: https://github.com/ergebnis/test-util/compare/0.9.0...0.9.1
[0.9.1...1.0.0]: https://github.com/ergebnis/test-util/compare/0.9.1...1.0.0
[1.0.0...master]: https://github.com/ergebnis/test-util/compare/1.0.0...master
[1.0.0...main]: https://github.com/ergebnis/test-util/compare/1.0.0...main

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

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

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

[![Latest Stable Version](https://poser.pugx.org/ergebnis/test-util/v/stable)](https://packagist.org/packages/ergebnis/test-util)
Expand Down Expand Up @@ -105,7 +105,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

0 comments on commit c83d674

Please sign in to comment.