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);