Skip to content

fix: refresh existing dev-tool sync branches - #2830

Merged
stranske merged 2 commits into
mainfrom
fix/refresh-existing-dev-tool-sync
Jul 26, 2026
Merged

stranske merged 2 commits into
mainfrom
fix/refresh-existing-dev-tool-sync

Conversation

@stranske

@stranske stranske commented Jul 25, 2026

Copy link
Copy Markdown
Owner

Maint 52 currently exits when a wave branch already has an open PR. If that generated branch is conflicted after main changes, the next sync cannot repair it. This updates the same wave branch from current main and force-pushes the regenerated dependency files before retaining the existing PR.

Summary by CodeRabbit

  • Bug Fixes
    • Improved automated version synchronization so existing update branches are refreshed when their generated content changes.
    • Prevented unnecessary updates when the existing branch already matches the latest default branch and generated content.
    • Avoided creating duplicate pull requests when an update pull request already exists.

@cursor

cursor Bot commented Jul 25, 2026

Copy link
Copy Markdown

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@coderabbitai

coderabbitai Bot commented Jul 25, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 20fbd609-4a3f-4b6e-9fa4-e272fbe5a479

📥 Commits

Reviewing files that changed from the base of the PR and between 9aa4404 and 200e8bf.

📒 Files selected for processing (1)
  • .github/workflows/maint-52-sync-dev-versions.yml

📝 Walkthrough

Walkthrough

The sync workflow now preserves existing wave pull request branches, regenerates desired contents from the default branch, compares ancestry and generated trees, updates changed branches, and avoids creating duplicate pull requests.

Changes

Wave PR synchronization

Layer / File(s) Summary
Rebuild and update existing wave branches
.github/workflows/maint-52-sync-dev-versions.yml
Existing pull requests are recorded instead of causing an immediate exit; the workflow compares branch ancestry and generated trees, updates changed branches, and skips duplicate pull request creation.

Estimated code review effort: 3 (Moderate) | ~15 minutes

Sequence Diagram(s)

sequenceDiagram
  participant SyncJob
  participant DefaultBranch
  participant ExistingWaveBranch
  participant GitHubPR
  SyncJob->>GitHubPR: detect existing wave PR
  SyncJob->>DefaultBranch: generate desired tree
  SyncJob->>ExistingWaveBranch: compare base and generated tree
  SyncJob->>ExistingWaveBranch: update branch when content differs
  SyncJob->>GitHubPR: skip creation when existing PR is present
Loading
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly matches the main change: refreshing existing dev-tool sync branches instead of creating new ones.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/refresh-existing-dev-tool-sync

Comment @coderabbitai help to get the list of available commands.

@stranske
stranske temporarily deployed to agent-high-privilege July 25, 2026 16:29 — with GitHub Actions Inactive
@stranske-keepalive

stranske-keepalive Bot commented Jul 25, 2026

Copy link
Copy Markdown
Contributor

Automated Status Summary

Head SHA: 80babda
Latest Runs: ⏳ pending — Gate
Required contexts: Gate / gate, Health 45 Agents Guard / guard
Required: core tests (3.12): ⏳ pending, core tests (3.13): ⏳ pending, docker smoke: ⏳ pending, gate: ⏳ pending

Workflow / Job Result Logs
(no jobs reported) ⏳ pending

Coverage Overview

  • Coverage history entries: 0

Updated automatically; will refresh on subsequent CI/Docker completions.


Keepalive checklist

Scope

No scope information available

Tasks

  • No tasks defined

Acceptance criteria

  • No acceptance criteria defined

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7f1e900b7c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread .github/workflows/maint-52-sync-dev-versions.yml
@stranske
stranske temporarily deployed to agent-high-privilege July 25, 2026 18:28 — with GitHub Actions Inactive
@stranske
stranske merged commit 5d25a44 into main Jul 26, 2026
50 checks passed
@stranske
stranske deleted the fix/refresh-existing-dev-tool-sync branch July 26, 2026 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant