This is an automated email from the ASF dual-hosted git repository. vatsrahul1001 pushed a commit to branch add-v3-3-test-branch-config in repository https://gitbox.apache.org/repos/asf/airflow.git
commit b2d69105a56f3855726350d7d215a175e1d36cf7 Author: Rahul Vats <[email protected]> AuthorDate: Wed Jun 17 18:34:52 2026 +0530 Add v3-3-test to CI, dependabot, backport, and fork-sync configuration The v3-3-test release branch was cut for the 3.3.0 release cycle, so the automation on main needs to cover it: dependabot dependency updates, milestone-tag-assistant, the CI-status notification matrix, and the release-management dry-run checks. Re-add the dev-tools backport auto-label rule in boring-cyborg.yml targeting v3-3-test (mirroring the one #68220 removed for v3-2-test), so PRs on main that touch dev-tooling paths are labelled for backport to the current maintenance branch and stay in sync. Point the fork-sync helper at v3-3-test (dropping v3-2-test there per the "replace" convention); v3-2-test is kept in dependabot and milestone coverage since 3.2.x is still maintained. --- .github/boring-cyborg.yml | 18 +++++++ .github/dependabot.yml | 73 +++++++++++++++++++++++++++ .github/workflows/basic-tests.yml | 8 +-- .github/workflows/ci-notification.yml | 2 +- .github/workflows/milestone-tag-assistant.yml | 1 + dev/sync_fork.sh | 2 +- 6 files changed, 98 insertions(+), 6 deletions(-) diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index 83b4595d939..f83c78cb39e 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -356,6 +356,24 @@ labelPRBasedOnFilePath: - .rat-excludes - .readthedocs.yml + # 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-3-test + # does not need a backport-to-v3-3-test label. + backport-to-v3-3-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. # Scoped to PRs targeting `main` only. diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2183d42af67..43c60328465 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -29,6 +29,19 @@ updates: patterns: - "*" + - package-ecosystem: "github-actions" + directory: "/" + cooldown: + default-days: 4 + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" + target-branch: v3-3-test + groups: + github-actions-updates: + patterns: + - "*" + - package-ecosystem: "github-actions" directory: "/" cooldown: @@ -200,6 +213,66 @@ updates: update-types: - "major" + # Repeat dependency updates on v3-3-test branch as well + - package-ecosystem: pip + cooldown: + default-days: 4 + directories: + - /airflow-core + - /airflow-ctl + - /clients/python + - /dev/breeze + - /docker-tests + - /kubernetes-tests + - /chart + - /task-sdk + - / + schedule: + interval: daily + target-branch: v3-3-test + groups: + pip-dependency-updates: + patterns: + - "*" + + - package-ecosystem: npm + cooldown: + default-days: 4 + directories: + - /airflow-core/src/airflow/ui + schedule: + interval: "weekly" + target-branch: v3-3-test + groups: + 3-3-core-ui-package-updates: + patterns: + - "*" + update-types: + - "minor" + - "patch" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major"] + + - package-ecosystem: npm + cooldown: + default-days: 4 + directories: + - /airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui + schedule: + interval: "weekly" + target-branch: v3-3-test + groups: + 3-3-auth-ui-package-updates: + patterns: + - "*" + update-types: + - "minor" + - "patch" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major"] + # Repeat dependency updates on v3-2-test branch as well - package-ecosystem: pip cooldown: diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index c6a9f4684cd..76b3fe1230b 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -341,14 +341,14 @@ jobs: - name: Install twine run: pip install twine - name: "Check Airflow create minor branch command" - run: breeze release-management create-minor-branch --version-branch 3-2 --answer yes --dry-run + run: breeze release-management create-minor-branch --version-branch 3-3 --answer yes --dry-run - name: "Check Airflow RC process command" run: > - breeze release-management start-rc-process --version 3.2.0rc1 --previous-version 3.1.0 - --task-sdk-version 1.1.0rc1 --sync-branch v3-2-test --answer yes --dry-run + breeze release-management start-rc-process --version 3.3.0rc1 --previous-version 3.2.0 + --task-sdk-version 1.2.0rc1 --sync-branch v3-3-test --answer yes --dry-run - name: "Check Airflow release process command" run: > - breeze release-management start-release --version 3.2.7 + breeze release-management start-release --version 3.3.7 --answer yes --dry-run - name: "Test providers metadata generation" run: | diff --git a/.github/workflows/ci-notification.yml b/.github/workflows/ci-notification.yml index b63949e563f..5ed31a99ff5 100644 --- a/.github/workflows/ci-notification.yml +++ b/.github/workflows/ci-notification.yml @@ -36,7 +36,7 @@ jobs: workflow-status: strategy: matrix: - branch: ["v3-2-test"] + branch: ["v3-3-test"] # Track AMD; ARM is the canary slot and is reported separately by # `ci-arm.yml`'s notify-slack job on schedule events. workflow-id: ["ci-amd.yml"] diff --git a/.github/workflows/milestone-tag-assistant.yml b/.github/workflows/milestone-tag-assistant.yml index 0a524eb9975..48d7af9fb1f 100644 --- a/.github/workflows/milestone-tag-assistant.yml +++ b/.github/workflows/milestone-tag-assistant.yml @@ -21,6 +21,7 @@ on: # yamllint disable-line rule:truthy push: branches: - main + - v3-3-test - v3-2-test - v3-1-test diff --git a/dev/sync_fork.sh b/dev/sync_fork.sh index 34ea63bcc33..20a78538634 100755 --- a/dev/sync_fork.sh +++ b/dev/sync_fork.sh @@ -43,7 +43,7 @@ set -euo pipefail UPSTREAM="${UPSTREAM_REMOTE:-upstream}" ORIGIN="${ORIGIN_REMOTE:-origin}" -DEFAULT_BRANCHES=(main v3-2-test airflow-ctl/v0-1-test) +DEFAULT_BRANCHES=(main v3-3-test airflow-ctl/v0-1-test) if [[ $# -gt 0 ]]; then BRANCHES=("$@")
