thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45466 from ClickHouse/cherrypick-search

Browse Source 
CherryPick: Fix a wrong staring search date
This commit is contained in:
Mikhail f. Shiryaev 2023-01-24 13:20:16 +01:00 committed by GitHub
commit b8474fd17f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/ci/cherry_pick.py
View File

@ -311,11 +311,13 @@ class Backport:
logging.info("Active releases: %s", ", ".join(self.release_branches)) logging.info("Active releases: %s", ", ".join(self.release_branches))
def receive_prs_for_backport(self): def receive_prs_for_backport(self):
# The commit is the oldest open release branch's merge-base # The commits in the oldest open release branch
since_commit = git_runner( oldest_branch_commits = git_runner(
f"git merge-base {self.remote}/{self.release_branches[0]} " "git log --no-merges --format=%H --reverse "
f"{self.remote}/{self.default_branch}" f"{self.remote}/{self.default_branch}..{self.remote}/{self.release_branches[0]}"
) )
# The first commit is the one we are looking for
since_commit = oldest_branch_commits.split("\n", 1)[0]
since_date = date.fromisoformat( since_date = date.fromisoformat(
git_runner.run(f"git log -1 --format=format:%cs {since_commit}") git_runner.run(f"git log -1 --format=format:%cs {since_commit}")
) )