Skip to content

[skia-sync] Merge upstream chrome/m147 bug fixes#4081

Merged
mattleibow merged 2 commits into
mainfrom
skia-sync/m147
May 30, 2026
Merged

[skia-sync] Merge upstream chrome/m147 bug fixes#4081
mattleibow merged 2 commits into
mainfrom
skia-sync/m147

Conversation

@mattleibow

Copy link
Copy Markdown
Contributor

Automated upstream bug-fix sync for m147.

mono/SkiaSharp PR Summary — Skia m147 sync

Overview

Same-milestone sync (m147 → m147). Picks up an internal mono/skia commit (es-metadata.yml)
that was on the skiasharp branch but not yet referenced by SkiaSharp's submodule pointer.

Changes

Submodule Update

  • externals/skia: 7a2d809b3cbf112f783f
    • New commit: adds es-metadata.yml (CI/DevOps scaffold metadata)

cgmanifest.json

  • commitHash for mono/skia: 8044793ff0...bf112f783f...
  • chrome_milestone: 147 (unchanged)
  • upstream_merge_commit: dcbd374c13... (unchanged — no new upstream commits)

Breaking Changes

None. This is a metadata-only sync with no C++ or API changes.

Category Count Items
Removed APIs 0
Renamed APIs 0
New APIs 0
Behavior changes 0

Version Changes

  • Milestone: 147 → 147 (unchanged)
  • NuGet version: 4.147.0 (unchanged)
  • SK_C_INCREMENT: 0 (unchanged)

Binding Regeneration

No changes — C API signatures unchanged. Bindings not regenerated.

Build & Test Results

Step Result
Native build (Linux x64) ✅ Clean
C# build ✅ 0 errors, 0 warnings
Full test suite ✅ Passed: 5504, Skipped: 171, Failed: 0

Skipped tests are GPU/Vulkan/D3D12 tests that self-skip when hardware is unavailable (expected on CI Linux).

Items Needing Human Attention

None. Routine metadata sync.

Created by skia-upstream-sync.

Picks up es-metadata.yml scaffold addition from mono/skia.

Changes:
- externals/skia: advance submodule to bf112f783f (adds es-metadata.yml)
- cgmanifest.json: update mono/skia commitHash to bf112f783f

No upstream C++ changes, no C API changes, no binding regeneration needed.
Build: Linux x64 clean, 5504 tests passed (171 skipped - GPU hardware not available).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions

github-actions Bot commented May 27, 2026

Copy link
Copy Markdown
Contributor

📦 Try the packages from this PR

Warning

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 -- 4081

PowerShell / Windows:

iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4081"

Step 2 — Add the local NuGet source

dotnet nuget add source ~/.skiasharp/hives/pr-4081/packages --name skiasharp-pr-4081
More options
Option Description
--successful-only / -SuccessfulOnly Only use successful builds
--force / -Force Overwrite previously downloaded packages
--list / -List List available artifacts without downloading
--build-id ID / -BuildId ID Download from a specific build

Or download manually from Azure Pipelines — look for the nuget artifact on the build for this PR.

Remove the source when you're done:

dotnet nuget remove source skiasharp-pr-4081

@github-actions

github-actions Bot commented May 27, 2026

Copy link
Copy Markdown
Contributor

📖 Documentation Preview

The documentation for this PR has been deployed and is available at:

🔗 View Staging Site
🔗 View Staging Docs
🔗 View Staging Gallery (Blazor)
🔗 View Staging Gallery (Uno Platform)
🔗 View Staging SkiaFiddle

This preview will be updated automatically when you push new commits to this PR.


This comment is automatically updated by the documentation staging workflow.

@mattleibow
mattleibow marked this pull request as ready for review May 30, 2026 08:12
@mattleibow
mattleibow merged commit e4de5e2 into main May 30, 2026
3 of 4 checks passed
@mattleibow
mattleibow deleted the skia-sync/m147 branch May 30, 2026 08:13
@mattleibow mattleibow added this to the 4.148.0-rc.1 milestone Jun 15, 2026
mattleibow added a commit that referenced this pull request Jun 17, 2026
The "Update Release Notes" agentic workflow
(.github/workflows/update-release-notes.md, timeout-minutes: 15) timed out on
its first post-merge run. The cause was the per-PR "effort" badge: it ran one
network `git fetch refs/pull/N/head` per PR to recover pre-squash commit
detail. For the 4.148 release that is 162 serial fetches, each paying full
proxied-TLS setup (~4s) behind the workflow's Squid firewall — ~11 min plus an
unshallow, blowing the 15-min cap. On timeout `safe_outputs` is skipped, so no
PR is ever opened and the cold author-cache never warms: the cold start cannot
self-heal.

The effort value (commit count + working days) earned none of that cost: it is
not rendered in the notes and the model never surfaced it. Everything actually
shown — title, author, number, body, companion skia link — already comes from a
single local `git log`.

Changes:

  * Remove the effort computation and its rendering entirely
    (_get_pr_effort_from_git, compute_pr_effort, _fetch_skia_pr_effort,
    add_pr_effort). This alone takes a cold full `--all` from a 15-min timeout
    to ~35s.
  * Keep the companion `skia: mono/skia#N` hint, parsed locally from the PR
    body, and add the `mono/skia#N` shorthand that milestone bumps use.
  * Resolve the companion link for submodule-bump PRs that don't spell it out,
    purely locally. The bump and its target skia SHA are read from the
    superproject tree (`git rev-parse <commit>:externals/skia` vs its parent);
    the bumped skia commit's own subject ((#N) / "Merge pull request #N") is then
    read from the submodule. The only network is one batched, blobless, shallow
    `git fetch` of just the bumped SHAs; already-present commits are skipped, so
    `--all` fetches each skia commit at most once (a handful per run, not 162).

For 4.148 this lifts companion-link coverage of skia-bumping PRs from 18 to 22
of 23. The single remaining gap is an anomalous backwards gitlink (PR #4081
resets the submodule to mono/skia's scaffold root, which has no PR); its real
companion, skia #242, is already linked via the forward bump. The other
historical misses are skia commits pushed directly to mono/skia with no PR at
all, so there is nothing to link.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@mattleibow mattleibow added the type/milestone-sync Any Skia upstream sync PR (milestone bump, same-milestone bug-fix re-sync, or tip sync). label Jul 3, 2026
@mattleibow mattleibow added the partner/agentic-workflows Issues and PRs created by SkiaSharp agentic workflows. label Jul 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

partner/agentic-workflows Issues and PRs created by SkiaSharp agentic workflows. type/milestone-sync Any Skia upstream sync PR (milestone bump, same-milestone bug-fix re-sync, or tip sync).

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant