Skip to content

Commit

Permalink
Merge pull request #4 from WyriHaximusNet/correct-default-branch-in-ci
Browse files Browse the repository at this point in the history
Correct default branch in GitHub configuration
  • Loading branch information
WyriHaximus authored Mar 9, 2021
2 parents cd8dd28 + c085fe7 commit 659da3f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repository:
has_issues: true
has_wiki: false
has_downloads: true
default_branch: master
default_branch: main
allow_squash_merge: false
allow_merge_commit: true
allow_rebase_merge: false
Expand Down Expand Up @@ -94,7 +94,7 @@ labels:
description: "Issue/PR opened by sponsor"

branches:
- name: master
- name: main
protection:
required_pull_request_reviews:
required_approving_review_count: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
on:
push:
branches:
- master
- main
pull_request:
jobs:
lint:
Expand Down

0 comments on commit 659da3f

Please sign in to comment.