Skip to content

[skia-sync] Merge upstream chrome/m151 #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mattleibow wants to merge 3 commits into from
Closed

[skia-sync] Merge upstream chrome/m151 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7be6d7
Roll infra dep to 055b758759c89b0cfafc8264ae2100a9aa6582d3
erock2112 Jul 30, 2026
86bb2f2
[M151] Address incorrect handling of a map pointer in SkRP
kjlubick Jul 29, 2026
eaf48b1
Merge remote-tracking branch 'upstream/chrome/m151' into skia-sync/m151
github-actions[bot] Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .disabled.go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/trietmn/go-wiki v1.0.1
github.com/vektra/mockery/v2 v2.52.2
go.chromium.org/luci v0.0.0-20251208084510-e9565e513ef0
go.skia.org/infra v0.0.0-20260626171410-c0e4e8a0a6bd
go.skia.org/infra v0.0.0-20260720042914-055b758759c8
google.golang.org/api v0.248.0
google.golang.org/protobuf v1.36.10
)
Expand Down
4 changes: 2 additions & 2 deletions .disabled.go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFh
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
go.skia.org/infra v0.0.0-20260626171410-c0e4e8a0a6bd h1:sH4D9hGdYPYg/euwa2nMUEqf9+o+drX9ggXeCVvrXqA=
go.skia.org/infra v0.0.0-20260626171410-c0e4e8a0a6bd/go.mod h1:IN8jdFPrIDrbWzJuEezIB11r3fTYzUaXSghv98C9/AM=
go.skia.org/infra v0.0.0-20260720042914-055b758759c8 h1:O4Ktwa//1RmWJdlP0i7zAdXLmLO9As/e1Nc5m8SLMJk=
go.skia.org/infra v0.0.0-20260720042914-055b758759c8/go.mod h1:UnvP4XqoBuJ0XkO7YhnU+EX7t3bzhfu4Gj8y1G0SN1o=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
Expand Down
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling different
# dependencies without interference from each other.
'infra_revision': 'c0e4e8a0a6bd68ffb5d8b01190d99edd9b89ecd5',
'infra_revision': '055b758759c89b0cfafc8264ae2100a9aa6582d3',

# ninja CIPD package version.
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
Expand Down
4 changes: 2 additions & 2 deletions infra/bots/deps/deps_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion infra/bots/task_drivers/canvaskit_gold/canvaskit_gold.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ func main() {
// directory (and default Bazel cache) lives, is only 15 GB on our GCE VMs.
CachePath: *bazelFlags.CacheDir,
}
if err := bazel.EnsureBazelRCFile(ctx, opts); err != nil {
cleanup, err := bazel.OverrideBazelRC(ctx, opts)
if err != nil {
td.Fatal(ctx, err)
}
defer cleanup()

if err := bazelTest(ctx, skiaDir, *bazelFlags.Label, *bazelFlags.Config,
"--config=linux_rbe", "--test_output=streamed", "--jobs="+strconv.Itoa(rbeJobs)); err != nil {
Expand Down
4 changes: 3 additions & 1 deletion infra/bots/task_drivers/check_generated_files/check_generated_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ func main() {
opts := bazel.BazelOptions{
CachePath: *bazelFlags.CacheDir,
}
if err := bazel.EnsureBazelRCFile(ctx, opts); err != nil {
cleanup, err := bazel.OverrideBazelRC(ctx, opts)
if err != nil {
td.Fatal(ctx, err)
}
defer cleanup()

if err := bazelRun(ctx, skiaPath, "//bazel/deps_parser", *bazelFlags.AdditionalArgs...); err != nil {
td.Fatal(ctx, err)
Expand Down
4 changes: 3 additions & 1 deletion infra/bots/task_drivers/cpu_tests/cpu_tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ func main() {
opts := bazel.BazelOptions{
CachePath: *bazelFlags.CacheDir,
}
if err := bazel.EnsureBazelRCFile(ctx, opts); err != nil {
cleanup, err := bazel.OverrideBazelRC(ctx, opts)
if err != nil {
td.Fatal(ctx, err)
}
defer cleanup()

if err := bazelTest(ctx, skiaDir, *bazelFlags.Label, *bazelFlags.Config, "--test_output=errors"); err != nil {
td.Fatal(ctx, err)
Expand Down
4 changes: 3 additions & 1 deletion infra/bots/task_drivers/go_linters/go_linters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ func main() {
opts := bazel.BazelOptions{
CachePath: *bazelFlags.CacheDir,
}
if err := bazel.EnsureBazelRCFile(ctx, opts); err != nil {
cleanup, err := bazel.OverrideBazelRC(ctx, opts)
if err != nil {
td.Fatal(ctx, err)
}
defer cleanup()

if err := bazelRun(ctx, skiaPath, "//:go", append(*bazelFlags.AdditionalArgs, "--", "fmt", "./...")...); err != nil {
td.Fatal(ctx, err)
Expand Down
4 changes: 3 additions & 1 deletion infra/bots/task_drivers/toolchain_layering_check/toolchain_layering_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ func main() {
// directory (and default Bazel cache) lives, is only 15 GB on our GCE VMs.
CachePath: *bazelFlags.CacheDir,
}
if err := bazel.EnsureBazelRCFile(ctx, opts); err != nil {
cleanup, err := bazel.OverrideBazelRC(ctx, opts)
if err != nil {
td.Fatal(ctx, err)
}
defer cleanup()

// This build should succeed
if err := bazelBuild(ctx, skiaDir, *bazelFlags.Label, *bazelFlags.Config); err != nil {
Expand Down
Loading