Skip to content

Clarify manual merging of PR in release doc #23928

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

Merged
ephraimbuddy merged 1 commit into from
May 26, 2022
Merged

Clarify manual merging of PR in release doc #23928

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
7 changes: 6 additions & 1 deletion dev/README_RELEASE_AIRFLOW.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,12 @@ 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.
- PR from the 'test' branch to the 'stable' branch, and manually merge it once approved. Here's how to manually merge the PR:
Copy link
Member

@potiuk potiuk May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be after checking out stable actually @ephraimbuddy

Copy link
Member

@potiuk potiuk May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed it in #23943 together with disabling rebase workflow from GitHub UI as it is dangerous to have it enabled (and the only reason I believe we had it was to merge test into stable).

Copy link
Member

@potiuk potiuk May 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged in #23943 :)


```shell script
git merge --ff-only v${VERSION_BRANCH}-test
```

- Check out the 'stable' branch

```shell script
Expand Down