Skip to content

Add support for require_last_push_approval flag on branch protection #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Add support for require_last_push_approval flag on branch protection #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceca180
Add support for require_last_push_approval flag on branch protection
jbonofre Mar 27, 2025
ecb2c59
Update branch_protection.py, set the push approval var
Humbedooh Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions asfyaml/feature/github/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class ASFGitHubFeature(ASFYamlFeature, name="github"):
{
strictyaml.Optional("dismiss_stale_reviews", default=False): strictyaml.Bool(),
strictyaml.Optional("require_code_owner_reviews", default=False): strictyaml.Bool(),
strictyaml.Optional("require_last_push_approval", default=False): strictyaml.Bool(),
strictyaml.Optional("required_approving_review_count", default=0): strictyaml.Int(),
}
),
Expand Down
3 changes: 3 additions & 0 deletions asfyaml/feature/github/branch_protection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,12 @@ def branch_protection(self: ASFGitHubFeature):
required_approving_review_count = required_pull_request_reviews.get("required_approving_review_count", 0)
require_code_owner_reviews = required_pull_request_reviews.get("require_code_owner_reviews")
dismiss_stale_reviews = required_pull_request_reviews.get("dismiss_stale_reviews", NotSet)
require_last_push_approval = required_pull_request_reviews.get("require_last_push_approval", NotSet)
else:
required_pull_request_reviews = NotSet
required_approving_review_count = NotSet
dismiss_stale_reviews = NotSet
require_last_push_approval = NotSet
require_code_owner_reviews = NotSet

required_checks: Opt[list[tuple[str, int]]]
Expand Down Expand Up @@ -255,6 +257,7 @@ def branch_protection(self: ASFGitHubFeature):
required_approving_review_count=required_approving_review_count,
dismiss_stale_reviews=dismiss_stale_reviews,
require_code_owner_reviews=require_code_owner_reviews,
require_last_push_approval=require_last_push_approval,
strict=require_strict,
checks=required_checks, # type: ignore
)
Expand Down