From 496e6b2e84b18d8a3ad02d04b36b0974f6b50ad0 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Thu, 26 May 2022 17:58:14 +0200 Subject: [PATCH] Disable rebase workflow The change of the release workflow in #23928 removed the reason why we should have rebase workflow possible. We only needed to do rebase when we merged test branch into stable branch and since we are doing it manually, there is no more reeason to have it in the GitHub UI. --- .asf.yaml | 2 +- dev/README_RELEASE_AIRFLOW.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 15dfd9b257639..44a819080e00e 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -39,7 +39,7 @@ github: enabled_merge_buttons: squash: true merge: false - rebase: true + rebase: false protected_branches: main: diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md index 6c050ebd4ab70..6dce6e487c64a 100644 --- a/dev/README_RELEASE_AIRFLOW.md +++ b/dev/README_RELEASE_AIRFLOW.md @@ -224,16 +224,16 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag - Update the `REVISION_HEADS_MAP` at airflow/utils/db.py to include the revision head of the release even if there are no migrations. - Commit the version change. -- PR from the 'test' branch to the 'stable' branch, and manually merge it once approved. Here's how to manually merge the PR: +- Check out the 'stable' branch ```shell script - git merge --ff-only v${VERSION_BRANCH}-test + git checkout v${VERSION_BRANCH}-stable ``` -- Check out the 'stable' branch +- PR from the 'test' branch to the 'stable' branch, and manually merge it once approved. Here's how to manually merge the PR: ```shell script - git checkout v${VERSION_BRANCH}-stable + git merge --ff-only v${VERSION_BRANCH}-test ``` - Tag your release