Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit e6a5b7b

Browse files
matanlureymatanlurey
committed
Merge remote-tracking branch 'upstream/main' into engine-dither-skia-dispatch-ignore
2 parents 57ad22d + 5a292e4 commit e6a5b7b

Some content is hidden

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

41 files changed

+900
-236
lines changed

‎DEPS

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'da3bb89a5d888acfd60524f79c18b36fd244221e',
21+
'skia_revision': '40442138ec94df1334ab9a6070ebaa67a3aad223',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -53,7 +53,7 @@ vars = {
5353
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5454
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5555
# updated revision list of existing dependencies.
56-
'dart_revision': '1859f7202bba2dabb1245e256626874ee21891e3',
56+
'dart_revision': '00f6f69187dfe3f0a93c3f9e10517aecee210b60',
5757

5858
# WARNING: DO NOT EDIT MANUALLY
5959
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -62,17 +62,17 @@ vars = {
6262
'dart_boringssl_rev': '74646566e93de7551bfdfc5f49de7462f13d1d05',
6363
'dart_browser_launcher_rev': '27ec600af41b0d0ebe9a3db6ad36e9ed11976b84',
6464
'dart_clock_rev': '263e508a36ed90e4d85b60dd70552d20e71a9ae9',
65-
'dart_collection_rev': '1ed009ea55434f58747209458a21faf8693fc6f7',
65+
'dart_collection_rev': '1a9b7eb64be10a8ba4ced7eb36b4b265a49d5d41',
6666
'dart_devtools_rev': '6f42c1d59d95dcacde130f2910c1d10be8508e61',
6767
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
6868
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
6969
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
70-
'dart_protobuf_rev': 'a852ba4e4b6f319c655fc938864dac8442b7c4ad',
70+
'dart_protobuf_rev': '5e8f36b48f015532cd1165b47686b659fc8870da',
7171
'dart_pub_rev': '42819a1e10f803eb7f6296692c5a976e1c647360',
7272
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
73-
'dart_tools_rev': '295ff92dbbb756bf9cc545f1b642cffd5988a079',
73+
'dart_tools_rev': '2be6c2ede4fec9455f6135878c1d63ed732f4749',
7474
'dart_watcher_rev': '7457413060ed7403b90b01533a61bd959932122e',
75-
'dart_webdev_rev': '19aad27b2dd0c713d0a477eeeac2bef10ecbf125',
75+
'dart_webdev_rev': 'fc876cb0de59526160ed17efaa920557a6e2ba32',
7676
'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6',
7777
'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce',
7878
'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -371,7 +371,7 @@ deps = {
371371
Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',
372372

373373
'src/third_party/dart/third_party/pkg/dartdoc':
374-
Var('dart_git') + '/dartdoc.git@5cfb1f366f5790dcf531edd528850001b8e2a75c',
374+
Var('dart_git') + '/dartdoc.git@e14837350492494bc693d69d29b9e21f50c224d0',
375375

376376
'src/third_party/dart/third_party/pkg/ffi':
377377
Var('dart_git') + '/ffi.git@e2c01a960b84d1074b0a1849909ae2d269d004be',
@@ -389,7 +389,7 @@ deps = {
389389
Var('dart_git') + '/html.git@4060496b0443451c38f8b789db2e44c0d7966171',
390390

391391
'src/third_party/dart/third_party/pkg/http':
392-
Var('dart_git') + '/http.git@9f167a72012503a0679c7004a037508304ee8bfc',
392+
Var('dart_git') + '/http.git@631d4ec1bcea311a4208b4e5e06031f0307ac9f0',
393393

394394
'src/third_party/dart/third_party/pkg/http_multi_server':
395395
Var('dart_git') + '/http_multi_server.git@aa128cfaf6ef1c9c1ace962ca2dcf6e5dddad441',
@@ -422,7 +422,7 @@ deps = {
422422
Var('dart_git') + '/mime.git@799b398140817fdb134f639d84e91c552e129136',
423423

424424
'src/third_party/dart/third_party/pkg/mockito':
425-
Var('dart_git') + '/mockito.git@ff79de69e9ef9e8647bd6008c29c16651c9ac220',
425+
Var('dart_git') + '/mockito.git@e54a00667cbe9a27de08e4c0ea355bacbe8c98d0',
426426

427427
'src/third_party/dart/third_party/pkg/native':
428428
Var('dart_git') + '/native.git@5a1361b6d98a84f8070c97872e3d3587fc0ba435',
@@ -473,7 +473,7 @@ deps = {
473473
Var('dart_git') + '/term_glyph.git@423700a3c019dc67f93d2bd6578016a1402506f7',
474474

475475
'src/third_party/dart/third_party/pkg/test':
476-
Var('dart_git') + '/test.git@bc0a992dd84f8d3f52cd04b6bfa9f466ca172272',
476+
Var('dart_git') + '/test.git@d0fc4bde2e05e62c75bc3ac7b3de3f510816ea44',
477477

478478
'src/third_party/dart/third_party/pkg/test_reflective_loader':
479479
Var('dart_git') + '/test_reflective_loader.git@0bfaad91ed308ce9da11b48395c8210d7542c16b',
@@ -894,7 +894,7 @@ deps = {
894894
'packages': [
895895
{
896896
'package': 'fuchsia/sdk/core/linux-amd64',
897-
'version': 'lDn2QLh1I7rtNu01ySR9vzGYwVjpCO1GD89M5cyrXQ0C'
897+
'version': 'RVhmZNTYsaIiTyjwPz_v93og9qBqvH0fo75kFNmXe10C'
898898
}
899899
],
900900
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

‎ci/builders/mac_android_aot_engine.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
],
1515
"drone_dimensions": [
1616
"device_type=none",
17-
"os=Mac-12",
18-
"cpu=x86"
17+
"os=Mac-12"
1918
],
2019
"gclient_variables": {
2120
"download_android_deps": false
@@ -53,8 +52,7 @@
5352
],
5453
"drone_dimensions": [
5554
"device_type=none",
56-
"os=Mac-12",
57-
"cpu=x86"
55+
"os=Mac-12"
5856
],
5957
"gclient_variables": {
6058
"download_android_deps": false
@@ -93,8 +91,7 @@
9391
],
9492
"drone_dimensions": [
9593
"device_type=none",
96-
"os=Mac-12",
97-
"cpu=x86"
94+
"os=Mac-12"
9895
],
9996
"gclient_variables": {
10097
"download_android_deps": false
@@ -133,8 +130,7 @@
133130
],
134131
"drone_dimensions": [
135132
"device_type=none",
136-
"os=Mac-12",
137-
"cpu=x86"
133+
"os=Mac-12"
138134
],
139135
"gclient_variables": {
140136
"download_android_deps": false
@@ -172,8 +168,7 @@
172168
],
173169
"drone_dimensions": [
174170
"device_type=none",
175-
"os=Mac-12",
176-
"cpu=x86"
171+
"os=Mac-12"
177172
],
178173
"gclient_variables": {
179174
"download_android_deps": false
@@ -212,8 +207,7 @@
212207
],
213208
"drone_dimensions": [
214209
"device_type=none",
215-
"os=Mac-12",
216-
"cpu=x86"
210+
"os=Mac-12"
217211
],
218212
"gclient_variables": {
219213
"download_android_deps": false

‎ci/builders/mac_host_engine.json

Lines changed: 103 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
],
1616
"drone_dimensions": [
1717
"device_type=none",
18-
"os=Mac-12",
19-
"cpu=x86",
20-
"mac_model=Macmini8,1"
18+
"os=Mac-12"
2119
],
2220
"gclient_variables": {
2321
"download_android_deps": false
@@ -49,21 +47,7 @@
4947
"$flutter/osx_sdk": {
5048
"sdk_version": "14e300c"
5149
}
52-
},
53-
"tests": [
54-
{
55-
"language": "python3",
56-
"name": "Host Tests for host_debug",
57-
"parameters": [
58-
"--variant",
59-
"host_debug",
60-
"--type",
61-
"dart,engine",
62-
"--engine-capture-core-dump"
63-
],
64-
"script": "flutter/testing/run_tests.py"
65-
}
66-
]
50+
}
6751
},
6852
{
6953
"archives": [
@@ -79,9 +63,7 @@
7963
],
8064
"drone_dimensions": [
8165
"device_type=none",
82-
"os=Mac-12",
83-
"cpu=x86",
84-
"mac_model=Macmini8,1"
66+
"os=Mac-12"
8567
],
8668
"gclient_variables": {
8769
"download_android_deps": false
@@ -108,21 +90,7 @@
10890
"$flutter/osx_sdk": {
10991
"sdk_version": "14e300c"
11092
}
111-
},
112-
"tests": [
113-
{
114-
"language": "python3",
115-
"name": "Host Tests for host_profile",
116-
"parameters": [
117-
"--variant",
118-
"host_profile",
119-
"--type",
120-
"dart,engine",
121-
"--engine-capture-core-dump"
122-
],
123-
"script": "flutter/testing/run_tests.py"
124-
}
125-
]
93+
}
12694
},
12795
{
12896
"archives": [
@@ -139,9 +107,7 @@
139107
],
140108
"drone_dimensions": [
141109
"device_type=none",
142-
"os=Mac-12",
143-
"cpu=x86",
144-
"mac_model=Macmini8,1"
110+
"os=Mac-12"
145111
],
146112
"dependencies": [
147113
{
@@ -178,20 +144,7 @@
178144
"$flutter/osx_sdk": {
179145
"sdk_version": "14e300c"
180146
}
181-
},
182-
"tests": [
183-
{
184-
"language": "python3",
185-
"name": "Impeller-golden, dart and engine tests for host_release",
186-
"parameters": [
187-
"--variant",
188-
"host_release",
189-
"--type",
190-
"dart,engine,impeller-golden"
191-
],
192-
"script": "flutter/testing/run_tests.py"
193-
}
194-
]
147+
}
195148
},
196149
{
197150
"archives": [
@@ -208,8 +161,7 @@
208161
],
209162
"drone_dimensions": [
210163
"device_type=none",
211-
"os=Mac-12",
212-
"cpu=x86"
164+
"os=Mac-12"
213165
],
214166
"gclient_variables": {
215167
"download_android_deps": false
@@ -255,8 +207,7 @@
255207
],
256208
"drone_dimensions": [
257209
"device_type=none",
258-
"os=Mac-12",
259-
"cpu=x86"
210+
"os=Mac-12"
260211
],
261212
"gclient_variables": {
262213
"download_android_deps": false
@@ -299,8 +250,7 @@
299250
],
300251
"drone_dimensions": [
301252
"device_type=none",
302-
"os=Mac-12",
303-
"cpu=x86"
253+
"os=Mac-12"
304254
],
305255
"gclient_variables": {
306256
"download_android_deps": false
@@ -476,5 +426,99 @@
476426
"destination": "darwin-x64-release/gen_snapshot.zip",
477427
"realm": "production"
478428
}
429+
],
430+
"tests": [
431+
{
432+
"name": "Mac Host Tests for host_debug",
433+
"recipe": "engine_v2/tester_engine",
434+
"drone_dimensions": [
435+
"device_type=none",
436+
"os=Mac-12",
437+
"cpu=x86"
438+
],
439+
"gclient_variables": {
440+
"download_android_deps": false
441+
},
442+
"dependencies": [
443+
"host_debug"
444+
],
445+
"tasks": [
446+
{
447+
"language": "python3",
448+
"name": "Host Tests for host_debug",
449+
"parameters": [
450+
"--variant",
451+
"host_debug",
452+
"--type",
453+
"dart,engine",
454+
"--engine-capture-core-dump"
455+
],
456+
"script": "flutter/testing/run_tests.py"
457+
}
458+
]
459+
},
460+
{
461+
"name": "Mac Impeller-golden, dart and engine tests for host_release",
462+
"recipe": "engine_v2/tester_engine",
463+
"drone_dimensions": [
464+
"device_type=none",
465+
"os=Mac-12",
466+
"cpu=x86"
467+
],
468+
"gclient_variables": {
469+
"download_android_deps": false
470+
},
471+
"dependencies": [
472+
"host_release"
473+
],
474+
"test_dependencies": [
475+
{
476+
"dependency": "goldctl",
477+
"version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
478+
}
479+
],
480+
"tasks": [
481+
{
482+
"language": "python3",
483+
"name": "Impeller-golden, dart and engine tests for host_release",
484+
"parameters": [
485+
"--variant",
486+
"host_release",
487+
"--type",
488+
"dart,engine,impeller-golden"
489+
],
490+
"script": "flutter/testing/run_tests.py"
491+
}
492+
]
493+
},
494+
{
495+
"name": "Mac Host Tests for host_profile",
496+
"recipe": "engine_v2/tester_engine",
497+
"drone_dimensions": [
498+
"device_type=none",
499+
"os=Mac-12",
500+
"cpu=x86"
501+
],
502+
"gclient_variables": {
503+
"download_android_deps": false
504+
},
505+
"dependencies": [
506+
"host_profile"
507+
],
508+
"tasks": [
509+
{
510+
"language": "python3",
511+
"name": "Host Tests for host_profile",
512+
"parameters": [
513+
"--variant",
514+
"host_profile",
515+
"--type",
516+
"dart,engine",
517+
"--engine-capture-core-dump"
518+
],
519+
"script": "flutter/testing/run_tests.py"
520+
}
521+
]
522+
}
479523
]
480524
}

0 commit comments

Comments
 (0)