This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi 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 90628e480a Order cherrypicking candidates by the closed date (#34739)
90628e480a is described below
commit 90628e480a61e7b4991d42a536b79e634dee7c12
Author: Ephraim Anierobi <[email protected]>
AuthorDate: Tue Oct 3 22:56:58 2023 +0100
Order cherrypicking candidates by the closed date (#34739)
Currently, the candidates are ordered by the PR number but ordering by the
closed date
is better and will help avoid some conflicts
---
dev/README_RELEASE_AIRFLOW.md | 4 +---
dev/airflow-github | 4 +++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md
index eef0150282..e206ef419b 100644
--- a/dev/README_RELEASE_AIRFLOW.md
+++ b/dev/README_RELEASE_AIRFLOW.md
@@ -129,9 +129,7 @@ branch you can run:
./dev/airflow-github compare 2.1.2 --unmerged
```
-Be careful and verify the hash commit specified. This is a 'best effort' to
find it, and
-could be inaccurate if the PR was referenced in other commits after it was
merged. You can start
-cherry picking from the bottom of the list. (older commits first)
+You can start cherry picking from the bottom of the list. (older commits first)
When you cherry-pick, pick in chronological order onto the `vX-Y-test` release
branch.
You'll move them over to be on `vX-Y-stable` once the release is cut. Use the
`-x` option
diff --git a/dev/airflow-github b/dev/airflow-github
index 8109521e4a..5a8a17cbf7 100755
--- a/dev/airflow-github
+++ b/dev/airflow-github
@@ -266,7 +266,9 @@ def compare(target_version, github_token,
previous_version=None, show_uncherrypi
url="URL",
)
)
-
+ milestone_issues = sorted(
+ milestone_issues, key=lambda x: x.closed_at if x.closed_at else
x.created_at, reverse=True
+ )
for issue in milestone_issues:
commit_in_main = get_commit_in_main_associated_with_pr(repo, issue)
status = issue.state.capitalize()