[skia-sync] Merge upstream chrome/m151 bug fixes#4302
Draft
mattleibow wants to merge 1 commit into
Draft
Conversation
Picks up 2 new commits from upstream/chrome/m151 since the previous sync (5209f4a49): - 1536d3975 Merge 3 release notes into RELEASE_NOTES.md - ac3c0d3fc Filter unsupported CQ try jobs on chrome/m151 Both commits touch only upstream docs / infra config. No C++, C API, DEPS, or generated-binding changes; C# API surface is unchanged. Same milestone bug-fix sync (current == target == m151), so no milestone / soname / nuget version bump — only cgmanifest.json's commitHash and upstream_merge_commit change. Native rebuild verified on Linux x64. Full test suite passes (0 failed, 5584 passed, 172 skipped). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
📦 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 -- 4302PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4302"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-4302/packages --name skiasharp-pr-4302More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-4302 |
Contributor
|
📖 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated upstream bug-fix sync for m151.
Companion skia PR: mono/skia#275
mono/SkiaSharp — Merge upstream
chrome/m151bug fixesCompanion to the mono/skia PR (
skia-sync/m151) that merges 2 newupstream commits (docs + infra) on top of our current m151 base.
mainskia-sync/m1515209f4a49b→67d4e950785b19ffa49ff1a8fd5f440ec628340dBreaking change analysis
None.
CURRENT == TARGET == m151, so this is a same-milestonebug-fix sync. The 2 upstream commits picked up (see the mono/skia PR
summary) touch only
RELEASE_NOTES.md,relnotes/*.md, andinfra/bots/*.json— no C++, no C API headers/implementations, noDEPS. Consequently there is no risk of API surface, ABI, or behaviourregression for downstream consumers.
Version file updates
Because it is a same-milestone sync, no version bumps were made:
scripts/VERSIONS.txtscripts/azure-templates-variables.ymlexternals/skia/include/c/sk_types.h(SK_C_INCREMENT)cgmanifest.json(commitHashformono/skia)5209f4a49b55104de2c521fc6f605aee530e4cd8→67d4e950785b19ffa49ff1a8fd5f440ec628340dcgmanifest.json(upstream_merge_commitfor CVE tracking)79e2e1538e94bb1d6b5bbbc56279036aa7574b10→1536d3975057297af8087d22419f6c95dc96305dchrome_milestonestays at151.Binding regeneration
Ran
pwsh .agents/skills/update-skia/scripts/regenerate-bindings.ps1:git statusafter regeneration is clean apart from the already-knowncgmanifest.json/ submodule-pointer edits — no*.generated.csfileswere modified. HarfBuzz bindings were auto-reverted by the script as
usual (unchanged in practice).
C# wrapper changes
None. No new C API functions ⇒ no new wrappers needed.
Build & test results (Linux x64)
Native build (Phase 7):
dotnet cake --target=externals-linux --arch=x64— success (15m 43s total; libSkiaSharp 14m 16s, libHarfBuzzSharp 1m 11s). BothlibSkiaSharp.so.151.0.0andlibHarfBuzzSharp.so.0.61421.0produced inoutput/native/linux/x64/.C# build (Phase 9):
dotnet build binding/SkiaSharp/SkiaSharp.csproj— success, 0 warnings, 0 errors across all TFMs (netstandard2.0/2.1, net462/48, net6.0, net9.0, net10.0, net9.0-android35.0, net10.0-android36.0).Tests (Phase 10):
dotnet test tests/SkiaSharp.Tests.Console/SkiaSharp.Tests.Console.csproj(net10.0 / x64):Full log at
/tmp/gh-aw/agent/test-output.txt(uploaded as workflowartifact). Note: a
--filter "Category=Smoke"was requested but thenew
Microsoft.Testing.Platformrunner emittedMTP0001 warning VSTest-specific properties are set but will be ignoredand executedthe full suite instead — which is the stronger signal we actually
need, so no re-run was necessary.
Items needing human attention
None. This is a low-risk, docs/infra-only upstream sync with a green
full build + test on Linux x64. Other platforms
(Windows/macOS/iOS/Android/WASM) will be exercised by CI on this PR.
Created by skia-upstream-sync.