You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ra...@apache.org on 2026/10/15 12:26:41 UTC

(airflow) 01/01: Re-enable backporting to v3-4-test for the 3.4.0 RC phase

This is an automated email from the ASF dual-hosted git repository.

vatsrahul1001 pushed a commit to branch reenable-v3-4-test-backport-automation
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit ae29aaca6efe5c082bb22ea6935f37ca715ad866
Author: Rahul Vats <ra...@gmail.com>
AuthorDate: Thu Oct 15 17:53:50 2026 +0530

    Re-enable backporting to v3-4-test for the 3.4.0 RC phase
    
    The beta fast-forward phase is over: v3-4-test now diverges from main and
    takes changes only by cherry-picking, so the backport automation that was
    paused for the betas has to come back on, otherwise contributors'
    backport-to-v3-4-test labels silently do nothing.
    
    Dependabot and the scheduled upgrade check stay paused through the RC phase
    to avoid dependency and CI churn on the release branch; they are re-enabled
    once 3.4.0 is released and the branch enters its patch cycle.
    
    Co-Authored-By: Claude <no...@anthropic.com>
---
 .github/boring-cyborg.yml                | 29 +++++++++++++----------------
 .github/workflows/automatic-backport.yml |  2 +-
 dev/README_RELEASE_AIRFLOW.md            | 23 +++++++++++++++--------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
index 13938591de4..7ab7202c442 100644
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@@ -373,26 +373,23 @@ labelPRBasedOnFilePath:
     - .rat-excludes
     - .readthedocs.yml
 
-  # Paused while v3-4-test is fast-forwarded to main for the 3.4.0 betas - nothing is
-  # cherry-picked yet. Uncomment when the 3.4.0 RCs start (see "Beta releases" in
-  # dev/README_RELEASE_AIRFLOW.md).
   # This should be copy of the "area:dev-tools" above minus contributing docs and some files that should
   # only make sense in main - it should be updated when we switch maintenance branch.
   # Scoped to PRs targeting `main` only — a PR opened directly against v3-4-test
   # does not need a backport-to-v3-4-test label.
-  # backport-to-v3-4-test:
-  #   paths:
-  #     - scripts/**/*
-  #     - dev/**/*
-  #     - .github/**/*
-  #     - Dockerfile.ci
-  #     - yamllint-config.yml
-  #     - .dockerignore
-  #     - .hadolint.yaml
-  #     - .pre-commit-config.yaml
-  #     - .rat-excludes
-  #   targetBranchFilter:
-  #     - ^main$
+  backport-to-v3-4-test:
+    paths:
+      - scripts/**/*
+      - dev/**/*
+      - .github/**/*
+      - Dockerfile.ci
+      - yamllint-config.yml
+      - .dockerignore
+      - .hadolint.yaml
+      - .pre-commit-config.yaml
+      - .rat-excludes
+    targetBranchFilter:
+      - ^main$
 
   # Apply to PRs touching airflow-ctl code so the release manager notices when a
   # fix should land on the airflow-ctl/v0-1-test maintenance branch.
diff --git a/.github/workflows/automatic-backport.yml b/.github/workflows/automatic-backport.yml
index a80d350e707..2ae729c70e6 100644
--- a/.github/workflows/automatic-backport.yml
+++ b/.github/workflows/automatic-backport.yml
@@ -51,7 +51,7 @@ jobs:
           # Branches fast-forwarded to main during a beta phase - a backport PR there would make
           # them diverge from main. Empty this list when the RCs start (see "Beta releases"
           # in dev/README_RELEASE_AIRFLOW.md).
-          BACKPORT_PAUSED_BRANCHES: '["v3-4-test"]'
+          BACKPORT_PAUSED_BRANCHES: '[]'
         with:
           script: |
             const pausedBranches = JSON.parse(process.env.BACKPORT_PAUSED_BRANCHES);
diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md
index c7dd2f54855..e808f0093a5 100644
--- a/dev/README_RELEASE_AIRFLOW.md
+++ b/dev/README_RELEASE_AIRFLOW.md
@@ -160,8 +160,13 @@ just before the first release candidate (`X.Y.0rc1`), when `main` starts accepti
 the next minor release. From that point on `vX-Y-test` diverges from `main` and changes reach it
 only by cherry-picking, as for a patch release. Announce the switch on the dev@airflow.apache.org
 list (so contributors know they need to start adding `backport-to-vX-Y-test` labels and milestones
-to the PRs they want in `X.Y.0`) and revert all the pauses listed above in a PR to `main`
-(this step is also called out at the start of [Build RC artifacts](#build-rc-artifacts)).
+to the PRs they want in `X.Y.0`) and re-enable backporting in a PR to `main` - uncomment the
+`backport-to-vX-Y-test` rule in `.github/boring-cyborg.yml` and set `BACKPORT_PAUSED_BRANCHES` to
+`[]` in `.github/workflows/automatic-backport.yml` (this step is also called out at the start of
+[Build RC artifacts](#build-rc-artifacts)). Leave Dependabot and the scheduled upgrade check
+(`.github/dependabot.yml`, `.github/workflows/scheduled-upgrade-check-vX-Y-test.yml`) paused through
+the RC phase to avoid dependency and CI churn on the release branch, and re-enable them once `X.Y.0`
+is released and the branch enters its patch cycle.
 
 
 ## i18n workflow
@@ -421,12 +426,14 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag
 > [!IMPORTANT]
 > When you start the release candidates of a major/minor release that went through beta releases
 > (`X.Y.0rc1`), `vX-Y-test` stops being fast-forwarded to `main` and changes reach it only by
-> cherry-picking from now on. Before cutting `X.Y.0rc1`, re-enable the `vX-Y-test` automation that
-> was paused for the betas in a PR to `main`: uncomment the `schedule` in
-> `.github/workflows/scheduled-upgrade-check-vX-Y-test.yml` and the `backport-to-vX-Y-test` rule in
-> `.github/boring-cyborg.yml`, remove `open-pull-requests-limit: 0` from the `vX-Y-test` entries in
-> `.github/dependabot.yml`, and remove `vX-Y-test` from `BACKPORT_PAUSED_BRANCHES` in
-> `.github/workflows/automatic-backport.yml`. See
+> cherry-picking from now on. Before cutting `X.Y.0rc1`, re-enable backporting in a PR to `main`:
+> uncomment the `backport-to-vX-Y-test` rule in `.github/boring-cyborg.yml` and set
+> `BACKPORT_PAUSED_BRANCHES` to `[]` in `.github/workflows/automatic-backport.yml`. Leave Dependabot
+> (`open-pull-requests-limit: 0` on the `vX-Y-test` entries in `.github/dependabot.yml`) and the
+> scheduled upgrade check (the commented `schedule` in
+> `.github/workflows/scheduled-upgrade-check-vX-Y-test.yml`) paused through the RC phase to keep the
+> release branch stable; re-enable them once `X.Y.0` is released and the branch enters its patch
+> cycle. See
 > [Beta releases: fast-forwarding `vX-Y-test` to `main`](#beta-releases-fast-forwarding-vx-y-test-to-main).
 
 - Set environment variables