Skip to content

Antalya 26.3 - Fix PRs in Release table #2000

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
strtgbb merged 1 commit into from
Jul 2, 2026
Merged

Antalya 26.3 - Fix PRs in Release table #2000

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
14 changes: 9 additions & 5 deletions .github/actions/create_workflow_report/create_workflow_report.py
View file
Open in desktop
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,11 +359,11 @@ 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 200 commits back.
# If no release tag, search recent history for the latest branch bootstrap merge.
subprocess.run(
["git", "fetch", "--deepen=200", "origin", branch_ref],
["git", "fetch", "--deepen=500", "origin", branch_ref],
cwd=cwd,
capture_output=True,
text=True,
Expand Down Expand Up @@ -1066,6 +1069,7 @@ def create_workflow_report(
"regression_fails": get_regression_fails(db_client, actions_run_url),
"docker_images_cves": [],
}
known_fails = {}

if pr_number == 0 and not mark_preview:
try:
Expand Down
Loading