Skip to content

Commit e61b8a0

Browse files
authored
Protect airflow-ctl/v0-1-stable and wire up backport label (#65610)
Add airflow-ctl/v0-1-stable to .asf.yaml protected_branches so merges require a reviewed PR and linear history, matching how core vX-Y-stable branches are protected. The companion airflow-ctl/v0-1-test branch is intentionally left unprotected so the release manager can push cherry-picks and sync-PR merge commits onto it directly. Wire backport-to-airflow-ctl-v0-1-test into boring-cyborg.yml on PRs touching airflow-ctl/**/* that target main, so the release manager sees at a glance which PRs might need to be backported to the 0.1 maintenance branch. The matching GitHub label backport-to-airflow-ctl-v0-1-test is created out-of-band via `gh label create`.
1 parent 1f984f3 commit e61b8a0

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

.asf.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ github:
162162
required_linear_history: true
163163
required_conversation_resolution: true
164164
required_signatures: false
165+
airflow-ctl/v0-1-stable:
166+
required_pull_request_reviews:
167+
required_approving_review_count: 1
168+
required_linear_history: true
169+
required_signatures: false
165170
collaborators:
166171
# Max 10 collaborators allowed
167172
# https://github.com/apache/infrastructure-asfyaml/blob/main/README.md#assigning-the-github-triage-role-to-external-collaborators

.github/boring-cyborg.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,15 @@ labelPRBasedOnFilePath:
365365
targetBranchFilter:
366366
- ^main$
367367

368+
# Apply to PRs touching airflow-ctl code so the release manager notices when a
369+
# fix should land on the airflow-ctl/v0-1-test maintenance branch.
370+
# Scoped to PRs targeting `main` only.
371+
backport-to-airflow-ctl-v0-1-test:
372+
paths:
373+
- airflow-ctl/**/*
374+
targetBranchFilter:
375+
- ^main$
376+
368377
kind:documentation:
369378
- airflow-core/docs/**/*
370379
- chart/docs/**/*

0 commit comments

Comments
 (0)