Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Related: https://github.com/ClickHouse/ClickHouse/pull/NNNNN
- [ ] <!---ci_exclude_stateful--> Stateful tests
- [ ] <!---ci_exclude_performance--> Performance tests
- [x] <!---ci_exclude_aarch64|arm--> Aarch64 tests
- [ ] <!---ci_exclude_asan--> All with ASAN
- [x] <!---ci_exclude_asan--> All with ASAN
- [x] <!---ci_exclude_tsan--> All with TSAN
- [x] <!---ci_exclude_msan--> All with MSAN
- [x] <!---ci_exclude_ubsan--> All with UBSAN
Expand Down
11 changes: 7 additions & 4 deletions .github/actions/create_workflow_report/create_workflow_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,15 @@ def _find_rebase_baseline(branch_ref: str, cwd: str | None) -> str | None:
"git",
"log",
branch_ref,
"--reverse",
"--first-parent",
"-n",
"1",
"-i",
"-E",
"--grep=^Rebase CICD",
"--grep=Merge pull request .*rebase-cicd",
"--grep=Merge pull request .*from Altinity/rebase/",
"--grep=Merge pull request .*from Altinity/bump/",
"--format=%H",
],
cwd=cwd,
Expand All @@ -339,7 +342,7 @@ def get_prs_in_release_dataframe(
) -> pd.DataFrame:
f"""
PRs merged into branch_ref that belong in the next release notes: after the latest GitHub
Release tag on this history, or after the oldest rebase bootstrap if no such tag exists.
Release tag on this history, or after the latest bootstrap merge if no such tag exists.
Only merge commits whose subject has from <repo_owner>/ (e.g. from Altinity/) are included.
Columns: pr_number, pr_name, labels. Omits PRs labeled cicd.
"""
Expand All @@ -356,9 +359,9 @@ def get_prs_in_release_dataframe(
check=False,
)

baseline_ref, baseline_sha = _find_release_baseline(branch_ref, repo, cwd)
_, baseline_sha = _find_release_baseline(branch_ref, repo, cwd)
if not baseline_sha:
# If no release tag, try to find rebase commit 500 commits back.
# If no release tag, search recent history for the latest branch bootstrap merge.
subprocess.run(
["git", "fetch", "--deepen=500", "origin", branch_ref],
cwd=cwd,
Expand Down
Loading
Loading