Skip to content

Commit d678a70

Browse files
mattleibowmattleibow
committed
Merge branch 'skiasharp' into pr/130
2 parents 7247a7e + fba3492 commit d678a70

File tree

2,116 files changed

+67538
-59798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,116 files changed

+67538
-59798
lines changed

‎.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.3.2
1+
6.3.2

‎.disabled.go.mod

+10-4
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,23 @@ require (
99
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
1010
github.com/google/uuid v1.1.2
1111
github.com/stretchr/testify v1.7.0
12+
github.com/trietmn/go-wiki v1.0.1
1213
go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
13-
go.skia.org/infra v0.0.0-20230904042911-f5590cb5133d
14+
go.skia.org/infra v0.0.0-20230929042634-a17b968c91ef
1415
google.golang.org/api v0.74.0
1516
google.golang.org/protobuf v1.28.0
1617
)
1718

19+
require github.com/shirou/gopsutil v3.21.11+incompatible
20+
1821
require (
1922
cloud.google.com/go v0.100.2 // indirect
2023
cloud.google.com/go/compute v1.5.0 // indirect
2124
cloud.google.com/go/iam v0.3.0 // indirect
2225
cloud.google.com/go/logging v1.1.1 // indirect
2326
cloud.google.com/go/secretmanager v1.4.0 // indirect
2427
github.com/aclements/go-moremath v0.0.0-20190830160640-d16893ddf098 // indirect
28+
github.com/anaskhan96/soup v1.2.5 // indirect
2529
github.com/bazelbuild/remote-apis v0.0.0-20201209220655-9e72daff42c9 // indirect
2630
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc // indirect
2731
github.com/beorn7/perks v1.0.1 // indirect
@@ -31,6 +35,7 @@ require (
3135
github.com/davecgh/go-spew v1.1.1 // indirect
3236
github.com/fiorix/go-web v1.0.1-0.20150221144011-5b593f1e8966 // indirect
3337
github.com/go-chi/chi/v5 v5.0.8 // indirect
38+
github.com/go-ole/go-ole v1.2.6 // indirect
3439
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3540
github.com/golang/mock v1.6.0 // indirect
3641
github.com/golang/protobuf v1.5.2 // indirect
@@ -60,13 +65,14 @@ require (
6065
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
6166
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
6267
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
68+
github.com/yusufpapurcu/wmi v1.2.2 // indirect
6369
github.com/zeebo/bencode v1.0.0 // indirect
6470
go.opencensus.io v0.23.0 // indirect
65-
golang.org/x/net v0.8.0 // indirect
71+
golang.org/x/net v0.15.0 // indirect
6672
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
6773
golang.org/x/sync v0.2.0 // indirect
68-
golang.org/x/sys v0.6.0 // indirect
69-
golang.org/x/text v0.8.0 // indirect
74+
golang.org/x/sys v0.12.0 // indirect
75+
golang.org/x/text v0.13.0 // indirect
7076
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
7177
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
7278
google.golang.org/appengine v1.6.7 // indirect

‎.disabled.go.sum

+21-10
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
7777
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
7878
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
7979
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
80+
github.com/anaskhan96/soup v1.2.5 h1:V/FHiusdTrPrdF4iA1YkVxsOpdNcgvqT1hG+YtcZ5hM=
81+
github.com/anaskhan96/soup v1.2.5/go.mod h1:6YnEp9A2yywlYdM4EgDz9NEHclocMepEtku7wg6Cq3s=
8082
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
8183
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
8284
github.com/bazelbuild/remote-apis v0.0.0-20200904140912-1aeb39973178/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
@@ -160,6 +162,8 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
160162
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
161163
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
162164
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
165+
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
166+
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
163167
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
164168
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
165169
github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
@@ -361,6 +365,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
361365
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
362366
github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
363367
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
368+
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
369+
github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
364370
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
365371
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
366372
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -386,6 +392,8 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP
386392
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
387393
github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U=
388394
github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8=
395+
github.com/trietmn/go-wiki v1.0.1 h1:OnKPSfE/XtWH9ybRxD7UcNv4bLzv8WcTWxwMcIDsFyg=
396+
github.com/trietmn/go-wiki v1.0.1/go.mod h1:HxeEu4ttJvFkRXY+XQu+ATZEh1S7J75+HRUoiZauzk8=
389397
github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
390398
github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
391399
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
@@ -399,6 +407,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
399407
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
400408
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
401409
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
410+
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
411+
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
402412
github.com/zeebo/bencode v1.0.0 h1:zgop0Wu1nu4IexAZeCZ5qbsjU4O1vMrfCrVgUjbHVuA=
403413
github.com/zeebo/bencode v1.0.0/go.mod h1:Ct7CkrWIQuLWAy9M3atFHYq4kG9Ao/SsY5cdtCXmp9Y=
404414
go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 h1:Qe0s5XpxD36QC+7OVnc1Ce8igF3sfTo3f3ad4WKEpNo=
@@ -412,8 +422,8 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
412422
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
413423
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
414424
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
415-
go.skia.org/infra v0.0.0-20230904042911-f5590cb5133d h1:JBd/8D0tRHOPtoaX8mvzjRvSIHVal3HlX77SORwlNxY=
416-
go.skia.org/infra v0.0.0-20230904042911-f5590cb5133d/go.mod h1:/ODF6heqsRI2bDfexYJWLYRrehjO1FMlSnjSEN4CBaU=
425+
go.skia.org/infra v0.0.0-20230929042634-a17b968c91ef h1:G3cVK7MzL89e9/rjRKwOHVPogvrkuCwbCvhxOlgYNb8=
426+
go.skia.org/infra v0.0.0-20230929042634-a17b968c91ef/go.mod h1:/ODF6heqsRI2bDfexYJWLYRrehjO1FMlSnjSEN4CBaU=
417427
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
418428
golang.org/x/build v0.0.0-20191031202223-0706ea4fce0c/go.mod h1:Nl5grlQor/lxfX9FfGLe+g2cVSCiURG36KQgsg/ODs4=
419429
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -423,7 +433,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
423433
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
424434
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
425435
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
426-
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI=
436+
golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
427437
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
428438
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
429439
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -509,8 +519,8 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx
509519
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
510520
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
511521
golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
512-
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
513-
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
522+
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
523+
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
514524
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
515525
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
516526
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -559,6 +569,7 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
559569
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
560570
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
561571
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
572+
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
562573
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
563574
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
564575
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -609,11 +620,11 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
609620
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
610621
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
611622
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
612-
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
613-
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
623+
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
624+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
614625
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
615626
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
616-
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
627+
golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
617628
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
618629
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
619630
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -623,8 +634,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
623634
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
624635
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
625636
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
626-
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
627-
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
637+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
638+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
628639
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
629640
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
630641
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎.disabled.go_repositories.bzl

+25-12
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ def go_repositories():
6464
sum = "h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=",
6565
version = "v0.0.0-20190924025748-f65c72e2690d",
6666
)
67+
go_repository(
68+
name = "com_github_anaskhan96_soup",
69+
importpath = "github.com/anaskhan96/soup",
70+
sum = "h1:V/FHiusdTrPrdF4iA1YkVxsOpdNcgvqT1hG+YtcZ5hM=",
71+
version = "v1.2.5",
72+
)
6773

6874
go_repository(
6975
name = "com_github_anmitsu_go_shlex",
@@ -2290,6 +2296,13 @@ def go_repositories():
22902296
sum = "h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ=",
22912297
version = "v0.0.0-20190109142713-0ad062ec5ee5",
22922298
)
2299+
go_repository(
2300+
name = "com_github_trietmn_go_wiki",
2301+
importpath = "github.com/trietmn/go-wiki",
2302+
sum = "h1:OnKPSfE/XtWH9ybRxD7UcNv4bLzv8WcTWxwMcIDsFyg=",
2303+
version = "v1.0.1",
2304+
)
2305+
22932306
go_repository(
22942307
name = "com_github_tv42_httpunix",
22952308
importpath = "github.com/tv42/httpunix",
@@ -2983,8 +2996,8 @@ def go_repositories():
29832996
go_repository(
29842997
name = "org_golang_x_crypto",
29852998
importpath = "golang.org/x/crypto",
2986-
sum = "h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI=",
2987-
version = "v0.0.0-20220112180741-5e0467b6c7ce",
2999+
sum = "h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=",
3000+
version = "v0.13.0",
29883001
)
29893002
go_repository(
29903003
name = "org_golang_x_exp",
@@ -3019,8 +3032,8 @@ def go_repositories():
30193032
go_repository(
30203033
name = "org_golang_x_net",
30213034
importpath = "golang.org/x/net",
3022-
sum = "h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=",
3023-
version = "v0.8.0",
3035+
sum = "h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=",
3036+
version = "v0.15.0",
30243037
)
30253038
go_repository(
30263039
name = "org_golang_x_oauth2",
@@ -3043,20 +3056,20 @@ def go_repositories():
30433056
go_repository(
30443057
name = "org_golang_x_sys",
30453058
importpath = "golang.org/x/sys",
3046-
sum = "h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=",
3047-
version = "v0.6.0",
3059+
sum = "h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=",
3060+
version = "v0.12.0",
30483061
)
30493062
go_repository(
30503063
name = "org_golang_x_term",
30513064
importpath = "golang.org/x/term",
3052-
sum = "h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=",
3053-
version = "v0.6.0",
3065+
sum = "h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=",
3066+
version = "v0.12.0",
30543067
)
30553068
go_repository(
30563069
name = "org_golang_x_text",
30573070
importpath = "golang.org/x/text",
3058-
sum = "h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=",
3059-
version = "v0.8.0",
3071+
sum = "h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=",
3072+
version = "v0.13.0",
30603073
)
30613074
go_repository(
30623075
name = "org_golang_x_time",
@@ -3080,8 +3093,8 @@ def go_repositories():
30803093
go_repository(
30813094
name = "org_skia_go_infra",
30823095
importpath = "go.skia.org/infra",
3083-
sum = "h1:JBd/8D0tRHOPtoaX8mvzjRvSIHVal3HlX77SORwlNxY=",
3084-
version = "v0.0.0-20230904042911-f5590cb5133d",
3096+
sum = "h1:G3cVK7MzL89e9/rjRKwOHVPogvrkuCwbCvhxOlgYNb8=",
3097+
version = "v0.0.0-20230929042634-a17b968c91ef",
30853098
)
30863099
go_repository(
30873100
name = "org_uber_go_atomic",

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ platform_tools/android/apps/*/.externalNativeBuild
4141
tools/skp/page_sets/data/*.json
4242
tools/skp/page_sets/data/*.wpr
4343

44-
common
4544
buildtools
4645
third_party/externals
4746

‎.gn

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ default_args = {
55
angle_standalone = false
66
angle_enable_msl_through_spirv = false
77
angle_use_wayland = false
8+
dawn_use_built_dxc = false
89
}

‎AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Wonmin Park <[email protected]>
9191
Yandex LLC <*@yandex-team.ru>
9292
Yong-Hwan Baek <[email protected]>
9393
Zhuo Qingliang <[email protected]>
94+
Luis Grimaldo <[email protected]>
9495
Zoho Corporation Private Limited <*@zohocorp.com>
9596
Soso Tsertsvadze <[email protected]>
9697

‎BUILD.bazel

+31-29
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("//:defines.bzl", "DEFAULT_DEFINES", "DEFAULT_LOCAL_DEFINES")
22
load("@skia_user_config//:copts.bzl", "DEFAULT_OBJC_COPTS")
3-
load("//bazel:flags.bzl", "selects")
43
load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_cc_library", "skia_objc_library")
54

65
licenses(["notice"])
@@ -82,22 +81,47 @@ skia_cc_library(
8281

8382
alias(
8483
name = "core",
85-
actual = "//src:core",
84+
actual = "//src/core:core",
85+
visibility = ["//visibility:public"],
86+
)
87+
88+
alias(
89+
name = "default_malloc",
90+
actual = "//src/ports:default_malloc",
8691
visibility = ["//visibility:public"],
8792
)
8893

8994
alias(
9095
name = "pathops",
91-
actual = "//src:pathops",
96+
actual = "//src/pathops:pathops",
9297
visibility = ["//visibility:public"],
9398
)
9499

95100
alias(
96-
name = "default_malloc",
97-
actual = "//src/ports:default_malloc",
101+
name = "png_decode_codec",
102+
actual = "//src/codec:png_decode",
103+
visibility = ["//visibility:public"],
104+
)
105+
106+
alias(
107+
name = "png_encode_codec",
108+
actual = "//src/codec:png_encode",
109+
visibility = ["//visibility:public"],
110+
)
111+
112+
# Font Manager Options. Pick at most one target starting with "default_font_manager" and as many
113+
# other font managers as desired (most clients only need one in practice).
114+
115+
alias(
116+
# No fonts will be able to created using the default FontMgr either directly
117+
# or indirectly (e.g. via SkTypeface::MakeFromStream)
118+
name = "default_font_manager_empty",
119+
actual = "//src/ports:default_font_manager_empty",
98120
visibility = ["//visibility:public"],
99121
)
100122

123+
# TODO(kjlubick) make other font manager options
124+
101125
# Load bearing comment below - gazelle looks here (and not in any other BUILD.bazel files)
102126
# for a special comment indicating the prefix.
103127
# gazelle:prefix go.skia.org/skia
@@ -110,37 +134,15 @@ alias(
110134
visibility = ["//visibility:public"],
111135
)
112136

113-
# Convenience condition that is always true. This condition is satisfied if an arbitrarily chosen
114-
# boolean built-in flag (https://bazel.build/docs/user-manual#stamp) is either true or false.
115-
#
116-
# Inspired by
117-
# https://github.com/bazelbuild/bazel-skylib/blob/2f0bb4cec0297bb38f830a72fa8961bee057c3cd/lib/selects.bzl#L227.
118-
selects.config_setting_group(
119-
name = "always_true",
120-
match_any = [
121-
":always_true_0",
122-
":always_true_1",
123-
],
124-
visibility = ["//visibility:public"],
125-
)
126-
127-
config_setting(
128-
name = "always_true_0",
129-
values = {"stamp": "0"},
130-
)
131-
132-
config_setting(
133-
name = "always_true_1",
134-
values = {"stamp": "1"},
135-
)
136-
137137
test_suite(
138138
name = "all_go_tests",
139139
tests = [
140140
# Go tests in this list will be tested in CI. Please add any new Go tests to this suite.
141141
"//bazel/exporter:exporter_test",
142142
"//infra/bots/task_drivers/bazel_test_gm:bazel_test_gm_test",
143+
"//infra/bots/task_drivers/bazel_test_precompiled:bazel_test_precompiled_test",
143144
"//infra/bots/task_drivers/codesize:codesize_test",
145+
"//infra/bots/task_drivers/common:common_test",
144146
"//infra/bots/task_drivers/perf_puppeteer_canvas:perf_puppeteer_canvas_test",
145147
"//infra/bots/task_drivers/perf_puppeteer_render_skps:perf_puppeteer_render_skps_test",
146148
"//infra/bots/task_drivers/perf_puppeteer_skottie_frames:perf_puppeteer_skottie_frames_test",

0 commit comments

Comments
 (0)