From 006dbf0a33fc3637a605feb660ff04c155ad3a9f Mon Sep 17 00:00:00 2001 From: Chris Hartgerink Date: Thu, 18 Apr 2024 11:00:24 +0200 Subject: [PATCH 1/3] Add `.github/settings.yml` --- .github/settings.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/settings.yml diff --git a/.github/settings.yml b/.github/settings.yml new file mode 100644 index 0000000..7fc1c3b --- /dev/null +++ b/.github/settings.yml @@ -0,0 +1,32 @@ +repository: + # See https://developer.github.com/v3/repos/#edit for all available settings. + private: false + has_issues: true + has_wiki: false + has_discussions: false + has_projects: false + default_branch: main + # Either `true` to allow squash-merging pull requests, or `false` to prevent + # squash-merging. + allow_squash_merge: true + # Either `true` to allow merging pull requests with a merge commit, or `false` + # to prevent merging pull requests with merge commits. + allow_merge_commit: true + # Either `true` to allow rebase-merging pull requests, or `false` to prevent + # rebase-merging. + allow_rebase_merge: true +branches: + - name: main + # https://docs.github.com/en/rest/reference/repos#update-branch-protection + protection: + required_pull_request_reviews: + # The number of approvals required. (1-6) + required_approving_review_count: 1 + # Dismiss approved reviews automatically when a new commit is pushed. + dismiss_stale_reviews: true + # Blocks merge until code owners have reviewed. + require_code_owner_reviews: true + # Required. Require status checks to pass before merging. Set to null to disable + required_status_checks: + # Required. Require branches to be up to date before merging. + strict: true From 5d4859ba94146d87eab63ee64db3e7b1d16ac1ea Mon Sep 17 00:00:00 2001 From: Chris Hartgerink Date: Thu, 18 Apr 2024 11:03:57 +0200 Subject: [PATCH 2/3] Update settings --- .github/settings.yml | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 7fc1c3b..c462f48 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,32 +1,22 @@ repository: - # See https://developer.github.com/v3/repos/#edit for all available settings. - private: false - has_issues: true - has_wiki: false + # https://probot.github.io/apps/settings/ + allow_merge_commit: false + allow_rebase_merge: true + allow_squash_merge: true + default_branch: main + delete_branch_on_merge: true has_discussions: false + has_issues: true has_projects: false - default_branch: main - # Either `true` to allow squash-merging pull requests, or `false` to prevent - # squash-merging. - allow_squash_merge: true - # Either `true` to allow merging pull requests with a merge commit, or `false` - # to prevent merging pull requests with merge commits. - allow_merge_commit: true - # Either `true` to allow rebase-merging pull requests, or `false` to prevent - # rebase-merging. - allow_rebase_merge: true + has_wiki: false + private: false branches: - name: main # https://docs.github.com/en/rest/reference/repos#update-branch-protection protection: required_pull_request_reviews: - # The number of approvals required. (1-6) - required_approving_review_count: 1 - # Dismiss approved reviews automatically when a new commit is pushed. + required_approving_review_count: 1 # (1-6) dismiss_stale_reviews: true - # Blocks merge until code owners have reviewed. - require_code_owner_reviews: true - # Required. Require status checks to pass before merging. Set to null to disable + require_code_owner_reviews: false required_status_checks: - # Required. Require branches to be up to date before merging. strict: true From 6856d01ce6e80db6d186193f8d860a50129056a2 Mon Sep 17 00:00:00 2001 From: Chris Hartgerink Date: Thu, 18 Apr 2024 14:02:15 +0200 Subject: [PATCH 3/3] Comment out values Based on https://github.com/epiverse-trace/packagetemplate/pull/145#discussion_r1570349141 --- .github/settings.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index c462f48..38bde78 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -5,17 +5,17 @@ repository: allow_squash_merge: true default_branch: main delete_branch_on_merge: true - has_discussions: false + # has_discussions: false has_issues: true - has_projects: false - has_wiki: false - private: false + # has_projects: false + # has_wiki: false + # private: false branches: - name: main # https://docs.github.com/en/rest/reference/repos#update-branch-protection protection: required_pull_request_reviews: - required_approving_review_count: 1 # (1-6) + required_approving_review_count: 0 # (1-6; optionally 0) dismiss_stale_reviews: true require_code_owner_reviews: false required_status_checks: