Skip to content
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.

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

Add feature gate prompt and backport label automation #24023

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@



<!-- OPTIONAL -->
<!-- Any changes that affect the behavior of a feature activation MUST add the feature-gate label and include details -->
#### Feature Gate Details
<!-- Describe why the new or modified feature gate is needed and any necessary conditions for its activation -->



#### Summary of Changes


Expand Down
38 changes: 29 additions & 9 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,30 +88,50 @@ pull_request_rules:
actions:
dismiss_reviews:
changes_requested: true
- name: set automerge label on mergify backport PRs
- name: v1.9 feature-gate backport
conditions:
- author=mergify[bot]
- head~=^mergify/bp/
- "#status-failure=0"
- "-merged"
- label=v1.9
- label=feature-gate
actions:
label:
add:
backport:
ignore_conflicts: true
labels:
- automerge
- name: v1.9 backport
- feature-gate
branches:
- v1.9
- name: v1.9 non-feature-gate backport
conditions:
- label=v1.9
- label!=feature-gate
actions:
backport:
ignore_conflicts: true
labels:
- automerge
branches:
- v1.9
- name: v1.10 backport
- name: v1.10 feature-gate backport
conditions:
- label=v1.10
- label=feature-gate
actions:
backport:
ignore_conflicts: true
labels:
- automerge
- feature-gate
branches:
- v1.10
- name: v1.10 non-feature-gate backport
conditions:
- label=v1.10
- label!=feature-gate
actions:
backport:
ignore_conflicts: true
labels:
- automerge
branches:
- v1.10

Expand Down