From c085fe7f3a473390ef23334ba413ce912e82cfd4 Mon Sep 17 00:00:00 2001 From: Cees-Jan Kiewiet Date: Tue, 9 Mar 2021 00:54:51 +0100 Subject: [PATCH] Correct default branch in GitHub configuration --- .github/settings.yml | 4 ++-- .github/workflows/ci.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 67ba9d3..ff03f1a 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -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 @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d0ca5f..4b891ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ env: on: push: branches: - - master + - main pull_request: jobs: lint: