[skia-sync] Merge upstream chrome/m151 bug fixes#4308
Conversation
Same-milestone bug-fix sync. No version bump. Upstream commits merged (both non-code): - 1536d39750 Merge 3 release notes into RELEASE_NOTES.md - ac3c0d3fcd Filter unsupported CQ try jobs on chrome/m151 Parent-repo changes: - Bump externals/skia submodule from e1be35b25f to de2e431eb3 - Update cgmanifest.json: - mono/skia commitHash -> de2e431eb3 - upstream_merge_commit -> 1536d3975057 (upstream chrome/m151 tip) No changes to C API, generated bindings, or any C++ source. C# build clean (0 errors, 0 warnings). Full test suite passes on Linux x64 (5584 passed, 172 skipped, 0 failed). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
📦 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 -- 4308PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4308"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-4308/packages --name skiasharp-pr-4308More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-4308 |
|
📖 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. |
|
Closing: this was a validation run for the versions.json-driven rotation change (#4306), not a real sync. Deleting the branch. |
Automated upstream bug-fix sync for m151.
Companion skia PR: mono/skia#277
Sync SkiaSharp with upstream chrome/m151 (bug-fix only)
Mode: Same-milestone bug-fix sync (
CURRENT == TARGET == m151,is_release == false).No milestone/version bump — this only re-syncs the
externals/skiasubmodule to pick up2 new bug-fix commits merged into mono/skia's
skiasharpbranch.Companion PR: mono/skia #NNN — Merge upstream chrome/m151 bug fixes
(created by the same automation run).
Breaking change analysis
None. The 2 upstream commits merged into mono/skia are:
1536d39750ac3c0d3fcdNo C++ API changes, no C API changes, no header changes, no DEPS changes, no
third-party dependency changes.
SK_C_INCREMENTremains at0.Version updates
None — same-milestone sync.
.agents/skills/update-skia/scripts/update-versions.ps1 -Current 151 -Target 151was run and gated ✅ with output:scripts/VERSIONS.txt— unchanged (milestone151, increment0, soname151.0.0, nuget4.151.0)scripts/azure-templates-variables.yml— unchanged (SKIASHARP_VERSION: 4.151.0)externals/skia/include/c/sk_types.h—SK_C_INCREMENTremains0Parent-repo changes (this PR)
cgmanifest.jsoncommitHash→de2e431eb3533193f077ad8a038a0a8239147db8cgmanifest.jsonupstream_merge_commit→1536d3975057297af8087d22419f6c95dc96305d(upstream chrome/m151 tip)externals/skiade2e431eb3(new mono/skia merge commit)Full parent-repo diff:
Bindings regeneration
.agents/skills/update-skia/scripts/regenerate-bindings.ps1was run and reported:binding/SkiaSharp/SkiaApi.generated.cs,binding/SkiaSharp.Skottie/SkottieApi.generated.cs,binding/SkiaSharp.SceneGraph/SceneGraphApi.generated.cs, andbinding/SkiaSharp.Resources/ResourcesApi.generated.csregenerated with no diff.HarfBuzz bindings reverted (as always in a Skia sync).
Phase 9 verification also clean:
C# wrapper changes
None. No new C API functions → no wrappers needed.
Build & test results (Linux x64)
dotnet cake --target=externals-linux --arch=x64libSkiaSharp.so.151.0.0,libHarfBuzzSharp.so.0.61421.0built)dotnet build binding/SkiaSharp/SkiaSharp.csprojFull test output is uploaded as workflow artifact
test-output.txt.Native build log is uploaded as workflow artifact
native-build.log.Items needing human attention
None. This is a pure bug-fix sync with no code changes, no conflicts, no C API
work, no new upstream gn args, and a fully green build + test run. Cross-platform CI
on this PR will validate Windows/macOS/iOS/Android/WASM builds as usual.
Notes
touch only release notes and CI infra, so cross-platform impact is zero.
externals/depot_tools/gclient_paths.py(@functools.lru_cache→@functools.lru_cache()for older Python compatibility). It was deliberately not committed as it's not part of
this sync.
Created by skia-upstream-sync.