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

Commit bf5f133

Browse files
committed
Add Dart AOT integration test
1 parent 9aefaef commit bf5f133

File tree

125 files changed

+1982
-678
lines changed

Some content is hidden

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

125 files changed

+1982
-678
lines changed

.ci.yaml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,22 @@ targets:
186186
clobber: "true"
187187
timeout: 60
188188

189-
- name: Linux clang-tidy
189+
- name: Linux Host clang-tidy
190190
recipe: engine/engine_lint
191191
properties:
192192
add_recipes_cq: "true"
193193
cores: "32"
194+
lint_android: "false"
195+
lint_host: "true"
196+
timeout: 60
197+
198+
- name: Linux Android clang-tidy
199+
recipe: engine/engine_lint
200+
properties:
201+
add_recipes_cq: "true"
202+
cores: "32"
203+
lint_android: "true"
204+
lint_host: "false"
194205
timeout: 60
195206

196207
- name: Linux Arm Host Engine
@@ -210,11 +221,10 @@ targets:
210221

211222
- name: Linux linux_host_engine
212223
recipe: engine_v2/engine_v2
213-
bringup: true
214224
timeout: 60
215225
properties:
216226
config_name: linux_host_engine
217-
environment: Staging
227+
environment: Production
218228

219229
- name: Linux linux_android_aot_engine
220230
recipe: engine_v2/engine_v2
@@ -304,11 +314,10 @@ targets:
304314

305315
- name: Mac mac_host_engine
306316
recipe: engine_v2/engine_v2
307-
bringup: true
308317
timeout: 60
309318
properties:
310319
config_name: mac_host_engine
311-
environment: Staging
320+
environment: Production
312321

313322
- name: Mac Unopt
314323
recipe: engine/engine_unopt
@@ -323,12 +332,24 @@ targets:
323332
xcode: 14a5294e # xcode 14.0 beta 5
324333
timeout: 75
325334

326-
- name: Mac clang-tidy
335+
- name: Mac Host clang-tidy
336+
recipe: engine/engine_lint
337+
properties:
338+
add_recipes_cq: "true"
339+
jazzy_version: "0.14.1"
340+
xcode: 14a5294e # xcode 14.0 beta 5
341+
lint_host: "true"
342+
lint_ios: "false"
343+
timeout: 75
344+
345+
- name: Mac iOS clang-tidy
327346
recipe: engine/engine_lint
328347
properties:
329348
add_recipes_cq: "true"
330349
jazzy_version: "0.14.1"
331350
xcode: 14a5294e # xcode 14.0 beta 5
351+
lint_host: "false"
352+
lint_ios: "true"
332353
timeout: 75
333354

334355
- name: Mac iOS Engine

.github/workflows/scorecards-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
persist-credentials: false
4444
- name: "Run analysis"
45-
uses: ossf/scorecard-action@865b4092859256271290c77adbd10a43f4779972
45+
uses: ossf/scorecard-action@e363bfca00e752f91de7b7d2a77340e2e523cb18
4646
with:
4747
results_file: results.sarif
4848
results_format: sarif
@@ -65,6 +65,6 @@ jobs:
6565

6666
# Upload the results to GitHub's code scanning dashboard.
6767
- name: "Upload to code-scanning"
68-
uses: github/codeql-action/upload-sarif@86f3159a697a097a813ad9bfa0002412d97690a4
68+
uses: github/codeql-action/upload-sarif@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44
6969
with:
7070
sarif_file: results.sarif

DEPS

Lines changed: 12 additions & 12 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': 'e11ad879ef49e0c7081d6fee9e3758b439077aa8',
21+
'skia_revision': '65505f07f072d15d925ebf1f62862ee9ac56b6ca',
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.
@@ -43,7 +43,7 @@ vars = {
4343
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
4444
# You can use //tools/dart/create_updated_flutter_deps.py to produce
4545
# updated revision list of existing dependencies.
46-
'dart_revision': 'e205126d124ca8cdc54a0d72ca43b10ab693b3f4',
46+
'dart_revision': '426453fdc4fbeaa62689155d58a158e8143b812f',
4747

4848
# WARNING: DO NOT EDIT MANUALLY
4949
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -109,7 +109,7 @@ allowed_hosts = [
109109
]
110110

111111
deps = {
112-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'b7ef254d8cec53bdad39cdb4a284af1d0a79dbdb',
112+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '64d07cbd3d9fa0c15f06c8e24c3bdbf5a9a06329',
113113

114114
# Fuchsia compatibility
115115
#
@@ -142,7 +142,7 @@ deps = {
142142
Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
143143

144144
'src/third_party/icu':
145-
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '3e03346162e9bdd41850a1184d2713da4add719e',
145+
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '20f8ac695af59b6c830def7d4e95bfeb13dd7be5',
146146

147147
'src/third_party/khronos':
148148
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '676d544d2b8f48903b7da9fceffaa534a5613978',
@@ -210,7 +210,7 @@ deps = {
210210
Var('dart_git') + '/dart_style.git@49bc3ff32b5578b6e19f8fd376d668130941ee29',
211211

212212
'src/third_party/dart/third_party/pkg/dartdoc':
213-
Var('dart_git') + '/dartdoc.git@a6676ee586283d6ea0f835f0c70fc1115400964f',
213+
Var('dart_git') + '/dartdoc.git@866338f12eb404217ec5a2e245ba5007779b7a3c',
214214

215215
'src/third_party/dart/third_party/pkg/ffi':
216216
Var('dart_git') + '/ffi.git@fb5f2667826c0900e551d19101052f84e35f41bf',
@@ -225,10 +225,10 @@ deps = {
225225
Var('dart_git') + '/glob.git@1d51fcc172e5adfbae6e82c3f8f119774cb2fca2',
226226

227227
'src/third_party/dart/third_party/pkg/html':
228-
Var('dart_git') + '/html.git@8243e967caad9932c13971af3b2a7c8f028383d5',
228+
Var('dart_git') + '/html.git@faafebfd2965ce38ed8ca22e42791255d48ad5e7',
229229

230230
'src/third_party/dart/third_party/pkg/http':
231-
Var('dart_git') + '/http.git@d6a4bf1e8f9d6e8f372958387cea32b0a6a62cfa',
231+
Var('dart_git') + '/http.git@738a55b20e391c5a526b86bf4b02af6b7745b494',
232232

233233
'src/third_party/dart/third_party/pkg/http_multi_server':
234234
Var('dart_git') + '/http_multi_server.git@20bf079c8955d1250a45afb9cb096472a724a551',
@@ -252,10 +252,10 @@ deps = {
252252
Var('dart_git') + '/matcher.git@6a9b83bbd73e50df2058b3e8e4aa301df49569c6',
253253

254254
'src/third_party/dart/third_party/pkg/mime':
255-
Var('dart_git') + '/mime.git@0a75a41445eb642674a0a271eecde78cb025ee60',
255+
Var('dart_git') + '/mime.git@bf041aa372a27aae6f94e185aa0af3932b9de98b',
256256

257257
'src/third_party/dart/third_party/pkg/mockito':
258-
Var('dart_git') + '/mockito.git@ef37e871d2673a66ca57303253901748622f04ca',
258+
Var('dart_git') + '/mockito.git@02ad6c793d9ea970b5cc892f45a55d12d8ebf4e8',
259259

260260
'src/third_party/dart/third_party/pkg/oauth2':
261261
Var('dart_git') + '/oauth2.git@199ebf15cbd5b07958438184f32e41c4447a57bf',
@@ -297,7 +297,7 @@ deps = {
297297
Var('dart_git') + '/stack_trace.git@17f09c2c6845bb31c7c385acecce5befb8527a13',
298298

299299
'src/third_party/dart/third_party/pkg/stream_channel':
300-
Var('dart_git') + '/stream_channel.git@63831cb74c5a413da893bda0fa4a80b5cb567076',
300+
Var('dart_git') + '/stream_channel.git@a5129ca44322a7024074ca38fb98e343dcb638c7',
301301

302302
'src/third_party/dart/third_party/pkg/string_scanner':
303303
Var('dart_git') + '/string_scanner.git@2d84b16d8ae03c3a8c2417b71abe0fe6de7d8bf6',
@@ -315,7 +315,7 @@ deps = {
315315
Var('dart_git') + '/typed_data.git@6369490ede1c87a4a5758304a606a6e4eee364b9',
316316

317317
'src/third_party/dart/third_party/pkg/usage':
318-
Var('dart_git') + '/usage.git@e287a72228974886d8a3b40ddcdf12f69d7c6a22',
318+
Var('dart_git') + '/usage.git@9a98c89163c7122bf946954209a69718300392d9',
319319

320320
'src/third_party/dart/third_party/pkg/watcher':
321321
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
@@ -424,7 +424,7 @@ deps = {
424424
Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
425425

426426
'src/third_party/libpng':
427-
Var('flutter_git') + '/third_party/libpng' + '@' + '134cf139cb24d802ee6ad5fc51bccff3221c2b49',
427+
Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
428428

429429
'src/third_party/libwebp':
430430
Var('chromium_git') + '/webm/libwebp.git' + '@' + '7dfde712a477e420968732161539011e0fd446cf', # 1.2.0

ci/builders/mac_host_engine.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
"base_path": "out/mac_debug_arm64/zip_archives/",
142142
"type": "gcs",
143143
"include_paths": [
144+
"out/mac_debug_arm64/zip_archives/darwin-arm64/artifacts.zip",
144145
"out/mac_debug_arm64/zip_archives/dart-sdk-darwin-arm64.zip"
145146
],
146147
"name": "mac_debug_arm64"
@@ -170,6 +171,7 @@
170171
"targets": [
171172
"flutter/build/archives:dart_sdk_archive",
172173
"flutter/build/archives:archive_gen_snapshot",
174+
"flutter/build/archives:artifacts",
173175
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
174176
]
175177
},
@@ -216,7 +218,9 @@
216218
{
217219
"base_path": "out/mac_release_arm64/zip_archives/",
218220
"type": "gcs",
219-
"include_paths": [],
221+
"include_paths": [
222+
"out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip"
223+
],
220224
"name": "mac_release_arm64"
221225
}
222226
],
@@ -242,7 +246,8 @@
242246
"config": "mac_release_arm64",
243247
"targets": [
244248
"flutter/build/archives:archive_gen_snapshot",
245-
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
249+
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
250+
"flutter/tools/font-subset"
246251
]
247252
},
248253
"tests": []

ci/licenses_golden/licenses_skia

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: d63829ecd31743a592927756ec45044f
1+
Signature: e192a98405d9cf027fcba5e32090db50
22

33
UNUSED LICENSES:
44

@@ -807,6 +807,7 @@ FILE: ../../../third_party/skia/infra/bots/assets/win_toolchain/VERSION
807807
FILE: ../../../third_party/skia/infra/bots/assets/xcode-11.4.1/VERSION
808808
FILE: ../../../third_party/skia/infra/bots/cfg.json
809809
FILE: ../../../third_party/skia/infra/bots/jobs.json
810+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-OptimizeForSize-Android_NoPatch.json
810811
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Android_API26.json
811812
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Android_ASAN.json
812813
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Chromebook_GLES.json
@@ -1057,7 +1058,6 @@ FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/util.js
10571058
FILE: ../../../third_party/skia/modules/canvaskit/interface.js
10581059
FILE: ../../../third_party/skia/modules/canvaskit/karma.bazel.js
10591060
FILE: ../../../third_party/skia/modules/canvaskit/karma.conf.js
1060-
FILE: ../../../third_party/skia/modules/canvaskit/karma.google3.conf.js
10611061
FILE: ../../../third_party/skia/modules/canvaskit/matrix.js
10621062
FILE: ../../../third_party/skia/modules/canvaskit/memory.js
10631063
FILE: ../../../third_party/skia/modules/canvaskit/package-lock.json
@@ -1254,24 +1254,24 @@ FILE: ../../../third_party/skia/src/sksl/analysis/BUILD.bazel
12541254
FILE: ../../../third_party/skia/src/sksl/codegen/BUILD.bazel
12551255
FILE: ../../../third_party/skia/src/sksl/dsl/BUILD.bazel
12561256
FILE: ../../../third_party/skia/src/sksl/dsl/priv/BUILD.bazel
1257-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.dehydrated.sksl
12581257
FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
1259-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl
1258+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.unoptimized.sksl
12601259
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.minified.sksl
1261-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl
1260+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.unoptimized.sksl
12621261
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.minified.sksl
1263-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.dehydrated.sksl
1262+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.unoptimized.sksl
12641263
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.minified.sksl
1265-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_vert.dehydrated.sksl
1264+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.unoptimized.sksl
12661265
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_vert.minified.sksl
1267-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_public.dehydrated.sksl
1266+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_vert.unoptimized.sksl
12681267
FILE: ../../../third_party/skia/src/sksl/generated/sksl_public.minified.sksl
1269-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_rt_shader.dehydrated.sksl
1268+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_public.unoptimized.sksl
12701269
FILE: ../../../third_party/skia/src/sksl/generated/sksl_rt_shader.minified.sksl
1271-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_shared.dehydrated.sksl
1270+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_rt_shader.unoptimized.sksl
12721271
FILE: ../../../third_party/skia/src/sksl/generated/sksl_shared.minified.sksl
1273-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl
1272+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_shared.unoptimized.sksl
12741273
FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.minified.sksl
1274+
FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.unoptimized.sksl
12751275
FILE: ../../../third_party/skia/src/sksl/ir/BUILD.bazel
12761276
FILE: ../../../third_party/skia/src/sksl/lex/BUILD.bazel
12771277
FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex
@@ -2643,6 +2643,7 @@ FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariab
26432643
FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp
26442644
FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateUnreachableCode.cpp
26452645
FILE: ../../../third_party/skia/src/sksl/transform/SkSLProgramWriter.h
2646+
FILE: ../../../third_party/skia/src/sksl/transform/SkSLReplaceConstVarsWithLiterals.cpp
26462647
FILE: ../../../third_party/skia/src/text/gpu/Slug.cpp
26472648
FILE: ../../../third_party/skia/src/text/gpu/SubRunAllocator.cpp
26482649
FILE: ../../../third_party/skia/src/text/gpu/SubRunAllocator.h
@@ -4032,8 +4033,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinMap.cpp
40324033
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinMap.h
40334034
FILE: ../../../third_party/skia/src/sksl/SkSLConstantFolder.cpp
40344035
FILE: ../../../third_party/skia/src/sksl/SkSLConstantFolder.h
4035-
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.cpp
4036-
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.h
40374036
FILE: ../../../third_party/skia/src/sksl/SkSLInliner.cpp
40384037
FILE: ../../../third_party/skia/src/sksl/SkSLInliner.h
40394038
FILE: ../../../third_party/skia/src/sksl/SkSLMemoryPool.h
@@ -5563,10 +5562,13 @@ FILE: ../../../third_party/skia/src/gpu/graphite/text/AtlasManager.cpp
55635562
FILE: ../../../third_party/skia/src/gpu/graphite/text/AtlasManager.h
55645563
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCaps.cpp
55655564
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCaps.h
5565+
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.cpp
5566+
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.h
55665567
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.cpp
55675568
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.h
55685569
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.cpp
55695570
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.h
5571+
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanUtils.h
55705572
FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp
55715573
FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h
55725574
FILE: ../../../third_party/skia/src/gpu/tessellate/LinearTolerances.h
@@ -5936,8 +5938,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.h
59365938
FILE: ../../../third_party/skia/src/opts/SkVM_opts.h
59375939
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp
59385940
FILE: ../../../third_party/skia/src/sksl/SkSLModifiersPool.h
5939-
FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.cpp
5940-
FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.h
59415941
FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructor.cpp
59425942
----------------------------------------------------------------------------------------------------
59435943
Copyright 2020 Google LLC.
@@ -6566,6 +6566,7 @@ FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlComputeCommandEncoder.h
65666566
FILE: ../../../third_party/skia/src/sfnt/SkOTTable_hmtx.h
65676567
FILE: ../../../third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.cpp
65686568
FILE: ../../../third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.h
6569+
FILE: ../../../third_party/skia/src/sksl/ir/SkSLLiteral.cpp
65696570
FILE: ../../../third_party/skia/src/text/gpu/SDFMaskFilter.h
65706571
FILE: ../../../third_party/skia/src/utils/SkBlitterTrace.h
65716572
FILE: ../../../third_party/skia/src/utils/SkBlitterTraceCommon.h

0 commit comments

Comments
 (0)