Skip to content

Commit 9423400

Browse files
authored
Remove default variant from raspi-2 and EG builders. (#5107)
We should rely on SB specific variants and to avoid confusion do away with default variants. b/404612333
1 parent 1a2d780 commit 9423400

6 files changed

+0
-51
lines changed

.github/config/evergreen-arm-hardfp.json

-10
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,11 @@
1111
]
1212
},
1313
"platforms": [
14-
"evergreen-arm-hardfp",
1514
"evergreen-arm-hardfp-sbversion-14",
1615
"evergreen-arm-hardfp-sbversion-15",
1716
"evergreen-arm-hardfp-sbversion-16"
1817
],
1918
"includes": [
20-
{
21-
"name":"hardfp",
22-
"platform":"evergreen-arm-hardfp",
23-
"target_platform":"evergreen-arm-hardfp",
24-
"target_cpu":"target_cpu=\\\"arm\\\"",
25-
"extra_gn_arguments":"use_asan=false",
26-
"evergreen_loader_extra_gn_arguments": "use_asan=false is_clang=false",
27-
"dimension": "release_version=regex:10.*"
28-
},
2919
{
3020
"name":"sbversion-14",
3121
"platform":"evergreen-arm-hardfp-sbversion-14",

.github/config/evergreen-arm-softfp.json

-9
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,11 @@
1111
]
1212
},
1313
"platforms": [
14-
"evergreen-arm-softfp",
1514
"evergreen-arm-softfp-sbversion-14",
1615
"evergreen-arm-softfp-sbversion-15",
1716
"evergreen-arm-softfp-sbversion-16"
1817
],
1918
"includes": [
20-
{
21-
"name":"softfp",
22-
"platform":"evergreen-arm-softfp",
23-
"target_platform":"evergreen-arm-softfp",
24-
"target_cpu":"target_cpu=\\\"arm\\\"",
25-
"extra_gn_arguments":"use_asan=false",
26-
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
27-
},
2819
{
2920
"name":"sbversion-14",
3021
"platform":"evergreen-arm-softfp-sbversion-14",

.github/config/evergreen-arm64.json

-9
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,11 @@
22
"docker_service": "build-android-evergreen",
33
"evergreen_loader": "android-arm64",
44
"platforms": [
5-
"evergreen-arm64",
65
"evergreen-arm64-sbversion-14",
76
"evergreen-arm64-sbversion-15",
87
"evergreen-arm64-sbversion-16"
98
],
109
"includes": [
11-
{
12-
"name":"arm64",
13-
"platform":"evergreen-arm64",
14-
"target_platform":"evergreen-arm64",
15-
"target_cpu":"target_cpu=\\\"arm64\\\"",
16-
"extra_gn_arguments":"use_asan=false",
17-
"evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
18-
},
1910
{
2011
"name":"sbversion-14",
2112
"platform":"evergreen-arm64-sbversion-14",

.github/config/evergreen-x64.json

-8
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,11 @@
44
"evergreen_loader": "linux-x64x11",
55
"on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"],
66
"platforms": [
7-
"evergreen-x64",
87
"evergreen-x64-sbversion-14",
98
"evergreen-x64-sbversion-15",
109
"evergreen-x64-sbversion-16"
1110
],
1211
"includes": [
13-
{
14-
"name":"x64",
15-
"platform":"evergreen-x64",
16-
"target_platform":"evergreen-x64",
17-
"target_cpu":"target_cpu=\\\"x64\\\"",
18-
"extra_gn_arguments":"use_asan=false"
19-
},
2012
{
2113
"name":"sbversion-14",
2214
"platform":"evergreen-x64-sbversion-14",

.github/config/linux.json

-6
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@
44
"on_host_test": true,
55
"on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"],
66
"platforms": [
7-
"linux-x64x11",
87
"linux-x64x11-egl",
98
"linux-x64x11-skia",
109
"linux-x64x11-sbversion-14",
1110
"linux-x64x11-sbversion-15",
1211
"linux-x64x11-sbversion-16"
1312
],
1413
"includes": [
15-
{
16-
"name":"x64",
17-
"platform":"linux-x64x11",
18-
"target_platform":"linux-x64x11"
19-
},
2014
{
2115
"name":"egl",
2216
"platform":"linux-x64x11-egl",

.github/config/raspi-2.json

-9
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,10 @@
1212
]
1313
},
1414
"platforms": [
15-
"raspi-2",
1615
"raspi-2-sbversion-15",
1716
"raspi-2-sbversion-16"
1817
],
1918
"includes": [
20-
{
21-
"name":"raspi",
22-
"platform":"raspi-2",
23-
"target_platform":"raspi-2",
24-
"target_cpu":"target_cpu=\\\"arm\\\"",
25-
"extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
26-
"dimension": "release_version=regex:10.*"
27-
},
2819
{
2920
"name":"sbversion-15",
3021
"platform":"raspi-2-sbversion-15",

0 commit comments

Comments
 (0)