Skip to content

Commit

Permalink
Disable rebase workflow (#23943)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
potiuk committed May 26, 2022
1 parent db890df commit 1748876
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ github:
enabled_merge_buttons:
squash: true
merge: false
rebase: true
rebase: false

protected_branches:
main:
Expand Down
8 changes: 4 additions & 4 deletions dev/README_RELEASE_AIRFLOW.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1748876

Please sign in to comment.