Support Skia M149#7
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: e550db8ef8
ℹ️ 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".
| if self.platform == "wasm" and lib.endswith('.a'): | ||
| src_file = src_dir / f"{lib[:-2]}.wasm.a" | ||
| else: |
There was a problem hiding this comment.
Fall back to legacy wasm archive names
Handle both lib*.wasm.a and lib*.a in move_libs() for wasm. The new code always reads lib<name>.wasm.a, but this rename only applies to M149+ (as your own comment notes), while the workflow default branch is still chrome/m144; on those branches the build outputs remain lib<name>.a. In that case this loop only logs warnings and produces an artifact missing the wasm static libs, so downstream consumers get a successful CI run with broken contents.
Useful? React with 👍 / 👎.
| - os: ubuntu-latest | ||
| platform: canvaskit | ||
| variant: gpu | ||
| arch: "wasm32" | ||
| config: Release |
There was a problem hiding this comment.
Publish CanvasKit output in release assets
Wire the new canvaskit matrix build into the release payload. This commit adds a dedicated CanvasKit job, but the create-release step still enumerates a fixed file list that does not include skia-build-canvaskit-wasm32-gpu-release.zip, so platforms=all releases silently omit the new artifact even though it was built and uploaded earlier in the workflow.
Useful? React with 👍 / 👎.
4a50af1 to
ad1c402
Compare
- Bump CI LLVM to 20.1.0; M149's bundled MSVC STL requires Clang 20+ - M149's wasm toolchain emits lib<name>.wasm.a; pass bare GN target names to ninja and rename outputs back to lib<name>.a on copy for downstream compatibility
Ungate GrD3DBackendFormatData::equal so Direct3D Release builds compile on M149, where the base class declares equal() as unconditionally pure virtual.
ad1c402 to
dd3da7c
Compare
lib<name>.wasm.aby passing bare GN target names to ninja and renaming back tolib<name>.aon copy.patches/fix_m149_d3d_backend_surface.patchungatesGrD3DBackendFormatData::equalso Windows Direct3D Release builds compile on m149;skia_use_direct3dstaystrue.Supersedes #11 (folded in).