You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by to...@apache.org on 2021/03/25 19:47:44 UTC

[db-jdo] 03/03: JDO-792: Add branch protection rules

This is an automated email from the ASF dual-hosted git repository.

tobous pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 24a5a88ad19c37c72dfc8f223ab9589cadf2ff7c
Author: Tobias Bouschen <to...@googlemail.com>
AuthorDate: Mon Mar 15 14:42:34 2021 +0100

    JDO-792: Add branch protection rules
    
    Adds the following branch protection rules for the 'master' branch:
    - require a linear history (disallow merge commits)
    
    Disables the option "Create a merge commit" for merging a PR as merge
    commits are not desired.
---
 .asf.yaml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index 78b18fb..0e0ec9b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -13,6 +13,24 @@ github:
     - apache
     - java
 
+  enabled_merge_buttons:
+    # disable merge button:
+    merge:   false
+    # enable squash button:
+    squash:  true
+    # enable rebase button:
+    rebase:  true
+
+  protected_branches:
+    # rules for the 'master' branch
+    master:
+      # disallows pushing merge commits to the branch
+      required_linear_history: true
+
+      required_status_checks:
+        # strict means "Require branches to be up to date before merging".
+        strict: false
+
 notifications:
   commits:      jdo-commits@db.apache.org
   issues:       jdo-dev@db.apache.org