This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 17488768bb Disable rebase workflow (#23943)
17488768bb is described below
commit 17488768bb84468d965cbce6b54186d6c76a1053
Author: Jarek Potiuk <[email protected]>
AuthorDate: Thu May 26 18:07:05 2022 +0200
Disable rebase workflow (#23943)
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 15dfd9b257..44a819080e 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 6c050ebd4a..6dce6e487c 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
