Skip to content

Commit

Permalink
Update the emulator versions and expose cipd. (flutter#6025)
Browse files Browse the repository at this point in the history 
Update the android virtual device to use the proto config as the version instead of the integer version. This is more robust from the recipes side as the chromium team is changing names.

Expose the avd_cipd_version flag so developers can update this without touching recipes.

*List which issues are fixed by this PR. You must list at least one issue.*
Fixes flutter/flutter#142261

*If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*
  • Loading branch information
@ricardoamador
ricardoamador authored Feb 1, 2024
1 parent cbaa340 commit 0f677d3
Showing 1 changed file with 22 additions and 20 deletions.
42 changes: 22 additions & 20 deletions .ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ platform_properties:
[
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"}
{"dependency": "curl", "version": "version:7.64.0"},
{"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
]
linux_android_legacy:
properties:
Expand All @@ -39,7 +40,8 @@ platform_properties:
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"},
{"dependency": "android_virtual_device", "version": "22"}
{"dependency": "android_virtual_device", "version": "generic_android22.textpb"},
{"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
]
linux_desktop:
properties:
Expand Down Expand Up @@ -321,7 +323,7 @@ targets:
# web_benchmarks needs Chrome.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"},
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand All @@ -342,7 +344,7 @@ targets:
# See comments on 'master' version above.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"},
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand Down Expand Up @@ -403,7 +405,7 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -422,7 +424,7 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -441,7 +443,7 @@ targets:
package_sharding: "--shardIndex 2 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -460,7 +462,7 @@ targets:
package_sharding: "--shardIndex 3 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -479,7 +481,7 @@ targets:
package_sharding: "--shardIndex 4 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -498,7 +500,7 @@ targets:
package_sharding: "--shardIndex 5 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -517,7 +519,7 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -536,7 +538,7 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -555,7 +557,7 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -574,7 +576,7 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -593,7 +595,7 @@ targets:
package_sharding: "--shardIndex 2 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -612,7 +614,7 @@ targets:
package_sharding: "--shardIndex 3 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -631,7 +633,7 @@ targets:
package_sharding: "--shardIndex 4 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -650,7 +652,7 @@ targets:
package_sharding: "--shardIndex 5 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "34"}
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -668,7 +670,7 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand All @@ -686,7 +688,7 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
]
env_variables: >-
{
Expand Down

0 comments on commit 0f677d3

Please sign in to comment.