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

Commit ada402b

Browse files
jonahwilliamsjonahwilliams
authored
Merge branch 'main' into force_compilation_arm_shaders_vulkan
2 parents 7c595cb + b15871b commit ada402b

File tree

6 files changed

+108
-110
lines changed

6 files changed

+108
-110
lines changed

‎DEPS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '6ae5032133d0b1a6987443916dc4c4f499e5b951',
17+
'skia_revision': 'bb61c2b4614e048b0fac8a4c3389f9631807953e',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -62,7 +62,7 @@ vars = {
6262
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
6363
# You can use //tools/dart/create_updated_flutter_deps.py to produce
6464
# updated revision list of existing dependencies.
65-
'dart_revision': 'fa66195a381484978ff75d48f7cc0c2a6276019f',
65+
'dart_revision': '6d659f880394936157cb33ddff6ffe48d9c04600',
6666

6767
# WARNING: DO NOT EDIT MANUALLY
6868
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -382,7 +382,7 @@ deps = {
382382
Var('dart_git') + '/dart_style.git@633b01cba68f4b42ddc2985c3d521c22149d5ce3',
383383

384384
'src/third_party/dart/third_party/pkg/dartdoc':
385-
Var('dart_git') + '/dartdoc.git@f152c0138bff8e4265a3459a6b08e4a83fe860b7',
385+
Var('dart_git') + '/dartdoc.git@7e171fc9d5ae2727ba2f7f7f78d3da5fb0dbbb1e',
386386

387387
'src/third_party/dart/third_party/pkg/file':
388388
Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7',
@@ -502,7 +502,7 @@ deps = {
502502
Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
503503

504504
'src/third_party/dart/third_party/pkg/web_socket_channel':
505-
Var('dart_git') + '/web_socket_channel.git@5241175e7c66271850d6e75fb9ec90068f9dd3c4',
505+
Var('dart_git') + '/web_socket_channel.git@3db86bc0a09e1038a0fa418262c8a92211c5de69',
506506

507507
'src/third_party/dart/third_party/pkg/webdev':
508508
Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),

‎ci/firebase_testlab.py

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
sys.exit(1)
2323
PROJECT = os.environ['GCP_PROJECT']
2424

25+
# Exit codes returned by the FTL command that signal an infrastructure failure.
26+
FTL_INFRA_FAILURE_CODES = [1, 15, 20]
27+
28+
# Maximum number of retries done if an infrastructure failure occurs.
29+
MAX_RETRY_ATTEMPTS = 2
30+
2531
script_dir = os.path.dirname(os.path.realpath(__file__))
2632
buildroot_dir = os.path.abspath(os.path.join(script_dir, '..', '..'))
2733
out_dir = os.path.join(buildroot_dir, 'out')
@@ -54,7 +60,7 @@ def run_firebase_test(apk, results_dir):
5460
'--results-dir',
5561
results_dir,
5662
'--device',
57-
'model=panther,version=33',
63+
'model=shiba,version=34',
5864
],
5965
stdout=subprocess.PIPE,
6066
stderr=subprocess.STDOUT,
@@ -106,7 +112,7 @@ def main():
106112
args = parser.parse_args()
107113

108114
apks_dir = os.path.join(out_dir, args.variant, 'firebase_apks')
109-
apks = glob.glob('%s/*.apk' % apks_dir)
115+
apks = set(glob.glob('%s/*.apk' % apks_dir))
110116

111117
if not apks:
112118
print('No APKs found at %s' % apks_dir)
@@ -115,27 +121,41 @@ def main():
115121
git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=script_dir)
116122
git_revision = byte_str_decode(git_revision)
117123
git_revision = git_revision.strip()
118-
results = []
119-
apk = None
120-
for apk in apks:
121-
results_dir = '%s/%s/%s' % (os.path.basename(apk), git_revision, args.build_id)
122-
process = run_firebase_test(apk, results_dir)
123-
results.append((results_dir, process))
124-
125-
for results_dir, process in results:
126-
for line in iter(process.stdout.readline, ''):
127-
print(line.strip())
128-
return_code = process.wait()
129-
if return_code != 0:
130-
print('Firebase test failed with code: %s' % return_code)
131-
sys.exit(return_code)
132-
133-
print('Checking logcat for %s' % results_dir)
134-
check_logcat(results_dir)
135-
# scenario_app produces a timeline, but the android image test does not.
136-
if 'scenario' in apk:
137-
print('Checking timeline for %s' % results_dir)
138-
check_timeline(results_dir)
124+
125+
for retry in range(MAX_RETRY_ATTEMPTS):
126+
if retry > 0:
127+
print('Retrying %s' % apks)
128+
129+
results = []
130+
for apk in sorted(apks):
131+
results_dir = '%s/%s/%s' % (os.path.basename(apk), git_revision, args.build_id)
132+
process = run_firebase_test(apk, results_dir)
133+
results.append((apk, results_dir, process))
134+
135+
for apk, results_dir, process in results:
136+
print('===== Test output for %s' % apk)
137+
for line in iter(process.stdout.readline, ''):
138+
print(line.strip())
139+
140+
return_code = process.wait()
141+
if return_code in FTL_INFRA_FAILURE_CODES:
142+
print('Firebase test %s failed with infrastructure error code: %s' % (apk, return_code))
143+
continue
144+
if return_code != 0:
145+
print('Firebase test %s failed with code: %s' % (apk, return_code))
146+
sys.exit(return_code)
147+
148+
print('Checking logcat for %s' % results_dir)
149+
check_logcat(results_dir)
150+
# scenario_app produces a timeline, but the android image test does not.
151+
if 'scenario' in apk:
152+
print('Checking timeline for %s' % results_dir)
153+
check_timeline(results_dir)
154+
155+
apks.remove(apk)
156+
157+
if not apks:
158+
break
139159

140160
return 0
141161

‎ci/licenses_golden/licenses_dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 9360f4a299b6c20efdce4d51ce7d89a1
1+
Signature: a348f03180c8303e25f71cb6a2e0b27d
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4749,7 +4749,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47494749
This Source Code Form is "Incompatible With Secondary Licenses", as
47504750
defined by the Mozilla Public License, v. 2.0.
47514751

4752-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/fa66195a381484978ff75d48f7cc0c2a6276019f
4752+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/6d659f880394936157cb33ddff6ffe48d9c04600
47534753
/third_party/fallback_root_certificates/
47544754

47554755
====================================================================================================

‎ci/licenses_golden/licenses_skia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: c6f3926a6849858dcd3f332ff4c57481
1+
Signature: 23ad9ac19ccf8eed4c2207328a3db033
22

33
====================================================================================================
44
LIBRARY: etc1

0 commit comments

Comments
 (0)