Skip to content

Commit

Permalink
Backport #41769 to 22.9: Fix the typo preventing building latest images
Browse files Browse the repository at this point in the history
  • Loading branch information
robot-clickhouse committed Sep 26, 2022
1 parent f5cfee7 commit 180d6a3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tests/ci/docker_images_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def gen_versions(
# The order is important, PR number is used as cache during the build
versions = [str(pr_info.number), pr_commit_version]
result_version = pr_commit_version
if pr_info.number == 0 and pr_info.base_name == "master":
if pr_info.number == 0 and pr_info.base_ref == "master":
# First get the latest for cache
versions.insert(0, "latest")

Expand Down
4 changes: 4 additions & 0 deletions tests/ci/pr_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,13 @@ def __init__(
self.commit_html_url = f"{repo_prefix}/commits/{self.sha}"
self.pr_html_url = f"{repo_prefix}/pull/{self.number}"

# master or backport/xx.x/xxxxx - where the PR will be merged
self.base_ref = github_event["pull_request"]["base"]["ref"]
# ClickHouse/ClickHouse
self.base_name = github_event["pull_request"]["base"]["repo"]["full_name"]
# any_branch-name - the name of working branch name
self.head_ref = github_event["pull_request"]["head"]["ref"]
# UserName/ClickHouse or ClickHouse/ClickHouse
self.head_name = github_event["pull_request"]["head"]["repo"]["full_name"]
self.body = github_event["pull_request"]["body"]
self.labels = {
Expand Down

0 comments on commit 180d6a3

Please sign in to comment.