Skip to content
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
10 changes: 8 additions & 2 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,18 @@ targets:
- name: Linux_android custom_package_tests master
recipe: packages/packages
timeout: 30
dimensions:
kvm: "1"
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: linux_custom_package_tests.yaml
# Pigeon tests need Andoid deps (thus the Linux_android base) and
# clang-format.
# Pigeon tests need Andoid deps (thus the Linux_android base), emulator,
# and clang-format.
# web_benchmarks needs Chrome.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand All @@ -256,12 +259,15 @@ targets:
- name: Linux_android custom_package_tests stable
recipe: packages/packages
timeout: 30
dimensions:
kvm: "1"
properties:
version_file: flutter_stable.version
target_file: linux_custom_package_tests.yaml
# See comments on 'master' version above.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand Down
10 changes: 2 additions & 8 deletions packages/pigeon/tool/run_tests.dart
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,8 @@ Future<void> main(List<String> args) async {
androidJavaUnitTests,
androidJavaLint,
androidKotlinUnitTests,
// TODO(stuartmorgan): Include these once CI supports running simulator
// tests. Currently these tests aren't run in CI.
// See https://github.com/flutter/flutter/issues/111505.
// androidJavaIntegrationTests,
// androidKotlinIntegrationTests,
androidJavaIntegrationTests,
androidKotlinIntegrationTests,
];
const List<String> macOSHostTests = <String>[
iOSObjCUnitTests,
Expand All @@ -198,9 +195,6 @@ Future<void> main(List<String> args) async {
windowsHostTests,
// Tests that are deliberately not included in CI:
<String>[
// See comment in linuxHostTests:
androidJavaIntegrationTests,
androidKotlinIntegrationTests,
// See comments in macOSHostTests:
iOSObjCIntegrationTests,
iOSSwiftIntegrationTests,
Expand Down