Skip to content

🧹 [μ½”λ“œ 건강도 κ°œμ„ ] perform_rebase ν•¨μˆ˜ λ¦¬νŒ©ν† λ§ 및 stale 라벨 제거 둜직 뢄리 #884

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

Open
seonghobae wants to merge 3 commits into
base: main
Choose a base branch
from
+16 βˆ’8
Open

🧹 [μ½”λ“œ 건강도 κ°œμ„ ] perform_rebase ν•¨μˆ˜ λ¦¬νŒ©ν† λ§ 및 stale 라벨 제거 둜직 뢄리 #884

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cccfed
🧹 [μ½”λ“œ 건강도 κ°œμ„ ] perform_rebase ν•¨μˆ˜ λ¦¬νŒ©ν† λ§ 및 stale 라벨 제거 둜직 뢄리
seonghobae Aug 9, 2026
6c673c9
🧹 [μ½”λ“œ 건강도 κ°œμ„ ] perform_rebase ν•¨μˆ˜ λ¦¬νŒ©ν† λ§ 및 stale 라벨 제거 둜직 뢄리
seonghobae Aug 9, 2026
3af07ff
🧹 [μ½”λ“œ 건강도 κ°œμ„ ] perform_rebase ν•¨μˆ˜ λ¦¬νŒ©ν† λ§ 및 stale 라벨 제거 둜직 뢄리
seonghobae Aug 9, 2026
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
24 changes: 16 additions & 8 deletions scripts/ci/pr_auto_rebase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,21 +504,28 @@ def label_conflicted_pr(repo: str, pr: dict[str, Any], base_ref: str, *, dry_run
return tuple(notes)


def clear_stale_manual_rebase_label(repo: str, pr: dict[str, Any], *, dry_run: bool) -> tuple[str, ...]:
"""Clear a stale manual-rebase label if present, returning audit notes."""
# A candidate reaching this point that still carries the manual-rebase label
# is no longer dirty (labeled-and-dirty PRs are skipped upstream): its
# conflict was resolved by a later base change, so clear the stale label and
# let the rebase proceed instead of leaving it permanently blocked.
if has_manual_rebase_label(pr):
remove_manual_rebase_label(repo, int(pr["number"]), dry_run=dry_run)
return (f"removed stale {MANUAL_REBASE_LABEL} label (no longer dirty)",)
return ()


def perform_rebase(repo: str, pr: dict[str, Any], *, dry_run: bool) -> Decision:
"""Rebase one candidate PR, force-pushing on success or labeling on conflict."""
number = int(pr["number"])
head_ref = validate_git_ref(pr["headRefName"])
base_ref = validate_git_ref(pr["baseRefName"])
expected_head_sha = validate_git_sha(pr["headRefOid"])
token = scheduler_token()
# A candidate reaching this point that still carries the manual-rebase label
# is no longer dirty (labeled-and-dirty PRs are skipped upstream): its
# conflict was resolved by a later base change, so clear the stale label and
# let the rebase proceed instead of leaving it permanently blocked.
stale_label_notes: tuple[str, ...] = ()
if has_manual_rebase_label(pr):
remove_manual_rebase_label(repo, number, dry_run=dry_run)
stale_label_notes = (f"removed stale {MANUAL_REBASE_LABEL} label (no longer dirty)",)

stale_label_notes = clear_stale_manual_rebase_label(repo, pr, dry_run=dry_run)

with tempfile.TemporaryDirectory(prefix="pr-auto-rebase-") as workdir:
fetch_pr_refs(workdir, repo, head_ref, base_ref, token=token)
if not try_rebase(workdir, base_ref):
Expand All @@ -530,6 +537,7 @@ def perform_rebase(repo: str, pr: dict[str, Any], *, dry_run: bool) -> Decision:
stale_label_notes + notes,
)
push_force_with_lease(workdir, repo, head_ref, expected_head_sha, token=token)

return Decision(
number,
"rebased",
Expand Down
Loading