Skip release branches for same-milestone Skia updates - #4948
Conversation
Compare the parent base and head milestones before preserving a release line so same-milestone updates targeting main do not create spurious release branches. Cover bump, no-op, regression, and version-consistency paths in CI. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57fee16d-a849-4b5c-8fac-e663b4aa907f
📦 Try the packages from this PRWarning Do not run these scripts without first reviewing the code in this PR. Step 1 — Download the packages bash / macOS / Linux: curl -fsSL https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.sh | bash -s -- 4948PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4948"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-4948/packages --name skiasharp-pr-4948More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-4948 |
Keep the fix focused on comparing the parent base and head milestones, and rely on the merge skill eval instead of a separate test harness and workflow expansion. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57fee16d-a849-4b5c-8fac-e663b4aa907f
📊 SkiaSharp benchmarks — PR #4948⭐ this PR (full source build) vs 🌙 nightly · Linux · Windows · macOS
Highlights⏱️ Time — 🔴 1 slower · 🟢 1 faster
Full per-OS benchmark deltasWindows⏱️ Time (vs 🌙 nightly
macOS⏱️ Time (vs 🌙 nightly
|
Keep post-merge verification and CI guidance tied to the parent PR base branch so servicing updates do not incorrectly refer to main. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57fee16d-a849-4b5c-8fac-e663b4aa907f
|
📖 Documentation Preview The documentation for this PR has been deployed and is available at: 🔗 View Staging Site This preview will be updated automatically when you push new commits to this PR. This comment is automatically updated by the documentation staging workflow. |
Description
Make the
merge-skia-updatelanding helper compare the parent PR's base and headchrome_milestonevalues before preserving a release line. Previously, every Skia update targetingmainderived and offered to create a release branch, including same-milestone bug-fix syncs such as m153 → m153.Same-milestone updates now exit without checking or creating release refs. Real milestone bumps still derive the previous
release/A.B.xline from the base commit, and the push path rechecks the parent head SHA before writing refs. Later merge guidance and post-merge verification now consistently use the resolved parent base branch, so servicing updates do not incorrectly refer tomain.Related issues
N/A.
Required skia PR
None.
Areas affected
binding/)externals/skia/src/c,include/c)Changes
None — automation-only; no public API or observable product behavior changes.
Testing
merge-skia-updatebehavioral eval for same-milestone updates targetingmain.main.main→skia-sync/m153); it reportedSame-milestone sync: m153 -> m153and created no refs.mainassumptions.Checklist
Changesabove lists all public API and behavioral changes (or "None.")