Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable rebase workflow #23943

Merged
merged 1 commit into from
May 26, 2022
Merged

Disable rebase workflow #23943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .asf.yaml
View file
Open in desktop
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
View file
Open in desktop
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