kevinjqliu commented on code in PR #4113:
URL: https://github.com/apache/iceberg-python/pull/4113#discussion_r4341666579
##########
.asf.yaml:
##########
@@ -33,38 +33,60 @@ github:
squash: true
squash_commit_message: PR_TITLE_AND_COMMIT_DETAILS
rebase: true
- protected_branches:
- main:
- required_status_checks:
- contexts:
- # Repository policy and security checks.
- - Analyze Actions
- - Run zizmor 🌈
- - asf-allowlist-check
- - rat
-
- # Documentation checks.
- - docs
- - markdown-link-check
-
- # Python workflow gates.
- - python-ci-required
- - python-integration-required
-
+ # Disabled: GitHub blocks ruleset bypass while classic protection exists.
+ # The "Default Branch Protection" ruleset replaces it.
+ protected_branches: ~
+ rulesets:
+ - name: "Default Branch Protection"
+ type: branch
+ branches:
+ includes:
+ - "~DEFAULT_BRANCH"
+ excludes: []
+ bypass_teams:
+ - root
+ restrict_deletion: true
+ restrict_force_push: true
+ required_linear_history: true
required_pull_request_reviews:
required_approving_review_count: 1
-
- required_linear_history: true
- rulesets:
- name: Merge Queue
target: branch
enforcement: active
+ bypass_actors:
+ # apache/root (ASF Infra).
+ - actor_id: 118420
+ actor_type: Team
+ bypass_mode: always
+ # apache/iceberg-public. Iceberg committers can opt into this team via
+ # https://gitbox.apache.org/boxer/.
+ - actor_id: 20107235
+ actor_type: Team
+ bypass_mode: pull_request
conditions:
ref_name:
include:
- "~DEFAULT_BRANCH"
exclude: []
rules:
+ - type: required_status_checks
+ parameters:
+ # Merge Queue already tests each entry against the latest main
+ strict_required_status_checks_policy: false
+ required_status_checks:
+ # Repository policy and security checks.
+ - context: Analyze Actions
+ - context: Run zizmor 🌈
+ - context: asf-allowlist-check
+ - context: rat
+
+ # Documentation checks.
+ - context: docs
+ - context: markdown-link-check
+
+ # Python workflow gates.
+ - context: python-ci-required
+ - context: python-integration-required
Review Comment:
i triple checked that these are the same name as the removed entries
##########
.asf.yaml:
##########
@@ -33,38 +33,60 @@ github:
squash: true
squash_commit_message: PR_TITLE_AND_COMMIT_DETAILS
rebase: true
- protected_branches:
- main:
- required_status_checks:
- contexts:
- # Repository policy and security checks.
- - Analyze Actions
- - Run zizmor 🌈
- - asf-allowlist-check
- - rat
-
- # Documentation checks.
- - docs
- - markdown-link-check
-
- # Python workflow gates.
- - python-ci-required
- - python-integration-required
-
+ # Disabled: GitHub blocks ruleset bypass while classic protection exists.
Review Comment:
verified that this is the same as latest main on iceberg-rust, which we are
mirroring
https://github.com/apache/iceberg-rust/blob/000e791d5229d9d136cda2b41fa0d7563fa58e1e/.asf.yaml#L54-L93
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
