vy commented on code in PR #471:
URL: https://github.com/apache/logging-parent/pull/471#discussion_r3176992922


##########
.asf.yaml:
##########
@@ -61,44 +54,39 @@ github:
   # Enforce squashing while merging PRs.
   # Otherwise, the git log gets polluted severely.
   enabled_merge_buttons:
-    squash: true
-    merge: false
-    rebase: false
+    squash:  true
+    merge:   false
+    rebase:  false
 
   features:
     issues: true
 
-  # Clear Protected Branches configuration: it is replaced by GitHub Rulesets
-  protected_branches: { }
-
-  rulesets:
-    # The `.asf.yaml` processor has a bug that prevents it from parsing 
existing rulesets.
-    # So it can neither remove them nor modify them.
-    # Hence, we bump the counter in the name at each change.
-    # For details, see: 
https://github.com/apache/infrastructure-asfyaml/pull/93
-    - name: "Branch protection (3)"
-      type: branch
-      branches:
-        includes:
-          - "~DEFAULT_BRANCH"
-          - "refs/heads/gha/*"
+  # Prevent force pushes to primary branches
+  protected_branches:
+    main:
+      # All reviews must be addressed before merging
+      required_conversation_resolution: true
+      # Require checks to pass before merging
+      required_status_checks:
+        checks:
+          # The GitHub Actions app: 15368
+          - app_id: 15368
+            context: "build / build (ubuntu-latest)"
+          # The GitHub Advanced Security app: 57789
+          - app_id: 57789
+            context: "CodeQL"
+      # At least one positive review must be present
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+    gha/v0:```

Review Comment:
   ```suggestion
       squash: true
       merge: false
       rebase: false
   
   features:
   issues: true
   
     # Prevent force pushes to primary branches
     protected_branches:
       main:
         # All reviews must be addressed before merging
         required_conversation_resolution: true
         # Require checks to pass before merging
         required_status_checks:
           checks:
             # The GitHub Actions app: 15368
             - app_id: 15368
               context: "build / build (ubuntu-latest)"
             # The GitHub Advanced Security app: 57789
             - app_id: 57789
               context: "CodeQL"
         # At least one positive review must be present
         required_pull_request_reviews:
           required_approving_review_count: 1
       gha/v0:
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to