Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 1 addition & 35 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ enabled_branches:
- dev
- beta
- stable
- flutter-2.5-candidate.5

platform_properties:
linux:
Expand Down Expand Up @@ -57,7 +58,6 @@ platform_properties:

targets:
- name: Linux Android AOT Engine
builder: Linux Android AOT Engine
recipe: engine
properties:
add_recipes_cq: "true"
Expand All @@ -68,7 +68,6 @@ targets:
scheduler: luci

- name: Linux Android Debug Engine
builder: Linux Android Debug Engine
recipe: engine
properties:
add_recipes_cq: "true"
Expand All @@ -81,7 +80,6 @@ targets:
scheduler: luci

- name: Linux Android Scenarios
builder: Linux Android Scenarios
bringup: true # Recipe issue https://github.com/flutter/flutter/issues/86427
recipe: engine/scenarios
properties:
Expand All @@ -91,7 +89,6 @@ targets:
scheduler: luci

- name: Linux Benchmarks
builder: Linux Benchmarks
enabled_branches:
- master
recipe: engine/engine_metrics
Expand All @@ -102,7 +99,6 @@ targets:
scheduler: luci

- name: Linux Fuchsia
builder: Linux Fuchsia
recipe: engine
properties:
add_recipes_cq: "true"
Expand All @@ -112,7 +108,6 @@ targets:
scheduler: luci

- name: Linux Fuchsia FEMU
builder: Linux Fuchsia FEMU
recipe: femu_test
properties:
add_recipes_cq: "true"
Expand All @@ -122,13 +117,11 @@ targets:
scheduler: luci

- name: Linux Framework Smoke Tests
builder: Linux Framework Smoke Tests
recipe: engine/framework_smoke
timeout: 60
scheduler: luci

- name: Linux Host Engine
builder: Linux Host Engine
recipe: engine
properties:
add_recipes_cq: "true"
Expand All @@ -137,15 +130,13 @@ targets:
scheduler: luci

- name: Linux Unopt
builder: Linux Unopt
recipe: engine_unopt
properties:
add_recipes_cq: "true"
timeout: 60
scheduler: luci

- name: Linux Arm Host Engine
builder: Linux Arm Host Engine
recipe: engine/engine_arm
properties:
add_recipes_cq: "true"
Expand All @@ -154,7 +145,6 @@ targets:
scheduler: luci

- name: Linux Web Engine
builder: Linux Web Engine
recipe: web_engine
properties:
add_recipes_cq: "true"
Expand All @@ -170,7 +160,6 @@ targets:
- flutter_frontend_server/**

- name: Linux Web Framework tests
builder: Linux Web Framework tests
recipe: engine/web_engine_framework
properties:
add_recipes_cq: "true"
Expand All @@ -189,7 +178,6 @@ targets:
- flutter_frontend_server/**

- name: Mac Android AOT Engine
builder: Mac Android AOT Engine
recipe: engine
properties:
android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
Expand All @@ -198,18 +186,7 @@ targets:
timeout: 60
scheduler: luci

- name: Mac Android Debug Engine
builder: Mac Android Debug Engine
recipe: engine
properties:
android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
build_android_debug: "true"
timeout: 60
scheduler: luci

- name: Mac Host Engine
builder: Mac Host Engine
recipe: engine
properties:
add_recipes_cq: "true"
Expand All @@ -218,7 +195,6 @@ targets:
scheduler: luci

- name: Mac Unopt
builder: Mac Unopt
recipe: engine_unopt
properties:
add_recipes_cq: "true"
Expand All @@ -227,7 +203,6 @@ targets:
scheduler: luci

- name: Mac iOS Engine
builder: Mac iOS Engine
recipe: engine
properties:
build_ios: "true"
Expand All @@ -237,7 +212,6 @@ targets:
scheduler: luci

- name: Mac Web Engine
builder: Mac Web Engine
recipe: web_engine
properties:
gcs_goldens_bucket: flutter_logs
Expand All @@ -252,7 +226,6 @@ targets:
- flutter_frontend_server/**

- name: Windows Android AOT Engine
builder: Windows Android AOT Engine
recipe: engine
properties:
build_android_aot: "true"
Expand All @@ -262,7 +235,6 @@ targets:
scheduler: luci

- name: Windows Host Engine
builder: Windows Host Engine
recipe: engine
timeout: 60
properties:
Expand All @@ -271,23 +243,20 @@ targets:
scheduler: luci

- name: Windows Unopt
builder: Windows Unopt
recipe: engine_unopt
properties:
add_recipes_cq: "true"
timeout: 75
scheduler: luci

- name: Windows UWP Engine
builder: Windows UWP Engine
recipe: engine
properties:
build_windows_uwp: "true"
timeout: 60
scheduler: luci

- name: Windows Web Engine
builder: Windows Web Engine
recipe: web_engine
properties:
gcs_goldens_bucket: flutter_logs
Expand All @@ -299,7 +268,6 @@ targets:
- web_sdk/**

- name: Mac iOS Engine Profile
builder: Mac iOS Engine Profile
presubmit: false
recipe: engine
properties:
Expand All @@ -310,7 +278,6 @@ targets:
scheduler: luci

- name: Mac iOS Engine Release
builder: Mac iOS Engine Release
presubmit: false
recipe: engine
properties:
Expand All @@ -321,7 +288,6 @@ targets:
scheduler: luci

- name: Linux ci_yaml engine roller
builder: Linux ci_yaml engine roller
bringup: true
presubmit: false
recipe: infra/ci_yaml
Expand Down
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '96fdaff98f48235b163278939c6d454caed5170c',
'dart_revision': 'efcdca04aac66e37d579d179866189385e63cd9a',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 13fa760c99e240d0330dbcd4a9c43357
Signature: 0e17a8bd44a6b7e8370697373939f62c

UNUSED LICENSES:

Expand Down
2 changes: 2 additions & 0 deletions lib/web_ui/lib/src/engine/keyboard.dart
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class Keyboard {
'keymap': 'web',
'code': keyboardEvent.code,
'key': keyboardEvent.key,
'location': keyboardEvent.location,
'metaState': _lastMetaState,
};

Expand All @@ -151,6 +152,7 @@ class Keyboard {
'keymap': 'web',
'code': event.code,
'key': event.key,
'location': event.location,
'metaState': _lastMetaState,
};

Expand Down
Loading