Skip to content

Commit 752f440

Browse files
zandersozanderso
authored
Further shard clang-tidy runs (flutter#43428)
The clang-tidy shards have crept up to 60 minutes on some runs. This PR will bring them back down to around 30 minutes. It does this by sharding the work for Mac/Linux `host_debug` across 4 shards. The clang-tidy work for ios/Android remains constrained to one shard. Unfortunately, the clang-tidy script sharding isn't smart enough to allow the ios/Android shards to participate in the `host_debug` sharding. This PR leaves that shard as-is, but we could further improve the runtime there if needed.
1 parent 24365fc commit 752f440

File tree

2 files changed

+192
-9
lines changed

2 files changed

+192
-9
lines changed

‎ci/builders/linux_clang_tidy.json‎

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,65 @@
3737
],
3838
"tests": [
3939
{
40-
"name": "test: lint host_debug",
40+
"name": "test: lint host_debug 0",
41+
"recipe": "engine_v2/tester_engine",
42+
"drone_dimensions": [
43+
"device_type=none",
44+
"os=Linux",
45+
"cores=32"
46+
],
47+
"gclient_variables": {
48+
"download_android_deps": false
49+
},
50+
"dependencies": [
51+
"host_debug"
52+
],
53+
"tasks": [
54+
{
55+
"name": "test: lint host_debug",
56+
"parameters": [
57+
"--variant",
58+
"host_debug",
59+
"--lint-all",
60+
"--shard-id=0",
61+
"--shard-variants=host_debug,host_debug,host_debug"
62+
],
63+
"max_attempts": 1,
64+
"script": "flutter/ci/lint.sh"
65+
}
66+
]
67+
},
68+
{
69+
"name": "test: lint host_debug 1",
70+
"recipe": "engine_v2/tester_engine",
71+
"drone_dimensions": [
72+
"device_type=none",
73+
"os=Linux",
74+
"cores=32"
75+
],
76+
"gclient_variables": {
77+
"download_android_deps": false
78+
},
79+
"dependencies": [
80+
"host_debug"
81+
],
82+
"tasks": [
83+
{
84+
"name": "test: lint host_debug",
85+
"parameters": [
86+
"--variant",
87+
"host_debug",
88+
"--lint-all",
89+
"--shard-id=1",
90+
"--shard-variants=host_debug,host_debug,host_debug"
91+
],
92+
"max_attempts": 1,
93+
"script": "flutter/ci/lint.sh"
94+
}
95+
]
96+
},
97+
{
98+
"name": "test: lint host_debug 2",
4199
"recipe": "engine_v2/tester_engine",
42100
"drone_dimensions": [
43101
"device_type=none",
@@ -58,10 +116,40 @@
58116
"--variant",
59117
"host_debug",
60118
"--lint-all",
61-
"--shard-id=1",
62-
"--shard-variants=android_debug_arm64"
119+
"--shard-id=2",
120+
"--shard-variants=host_debug,host_debug,host_debug"
63121
],
64-
"max_attempts": 1,
122+
"max_attempts": 1,
123+
"script": "flutter/ci/lint.sh"
124+
}
125+
]
126+
},
127+
{
128+
"name": "test: lint host_debug 3",
129+
"recipe": "engine_v2/tester_engine",
130+
"drone_dimensions": [
131+
"device_type=none",
132+
"os=Linux",
133+
"cores=32"
134+
],
135+
"gclient_variables": {
136+
"download_android_deps": false
137+
},
138+
"dependencies": [
139+
"host_debug",
140+
"android_debug_arm64"
141+
],
142+
"tasks": [
143+
{
144+
"name": "test: lint host_debug",
145+
"parameters": [
146+
"--variant",
147+
"host_debug",
148+
"--lint-all",
149+
"--shard-id=3",
150+
"--shard-variants=host_debug,host_debug,host_debug"
151+
],
152+
"max_attempts": 1,
65153
"script": "flutter/ci/lint.sh"
66154
}
67155
]

‎ci/builders/mac_clang_tidy.json‎

Lines changed: 100 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
],
4747
"tests": [
4848
{
49-
"name": "test: lint host_debug",
49+
"name": "test: lint host_debug 0",
5050
"recipe": "engine_v2/tester_engine",
5151
"drone_dimensions": [
5252
"device_type=none",
@@ -57,8 +57,7 @@
5757
"download_android_deps": false
5858
},
5959
"dependencies": [
60-
"host_debug",
61-
"ios_debug_sim"
60+
"host_debug"
6261
],
6362
"contexts": [
6463
"osx_sdk"
@@ -70,14 +69,110 @@
7069
"--variant",
7170
"host_debug",
7271
"--lint-all",
73-
"--shard-id=1",
74-
"--shard-variants=ios_debug_sim"
72+
"--shard-id=0",
73+
"--shard-variants=host_debug,host_debug,host_debug"
7574
],
7675
"max_attempts": 1,
7776
"script": "flutter/ci/lint.sh"
7877
}
7978
]
8079
},
80+
{
81+
"name": "test: lint host_debug 1",
82+
"recipe": "engine_v2/tester_engine",
83+
"drone_dimensions": [
84+
"device_type=none",
85+
"os=Mac",
86+
"cpu=arm64"
87+
],
88+
"gclient_variables": {
89+
"download_android_deps": false
90+
},
91+
"dependencies": [
92+
"host_debug"
93+
],
94+
"contexts": [
95+
"osx_sdk"
96+
],
97+
"tasks": [
98+
{
99+
"name": "test: lint host_debug",
100+
"parameters": [
101+
"--variant",
102+
"host_debug",
103+
"--lint-all",
104+
"--shard-id=1",
105+
"--shard-variants=host_debug,host_debug,host_debug"
106+
],
107+
"max_attempts": 1,
108+
"script": "flutter/ci/lint.sh"
109+
}
110+
]
111+
},
112+
{
113+
"name": "test: lint host_debug 2",
114+
"recipe": "engine_v2/tester_engine",
115+
"drone_dimensions": [
116+
"device_type=none",
117+
"os=Mac",
118+
"cpu=arm64"
119+
],
120+
"gclient_variables": {
121+
"download_android_deps": false
122+
},
123+
"dependencies": [
124+
"host_debug"
125+
],
126+
"contexts": [
127+
"osx_sdk"
128+
],
129+
"tasks": [
130+
{
131+
"name": "test: lint host_debug",
132+
"parameters": [
133+
"--variant",
134+
"host_debug",
135+
"--lint-all",
136+
"--shard-id=2",
137+
"--shard-variants=host_debug,host_debug,host_debug"
138+
],
139+
"max_attempts": 1,
140+
"script": "flutter/ci/lint.sh"
141+
}
142+
]
143+
},
144+
{
145+
"name": "test: lint host_debug 3",
146+
"recipe": "engine_v2/tester_engine",
147+
"drone_dimensions": [
148+
"device_type=none",
149+
"os=Mac",
150+
"cpu=arm64"
151+
],
152+
"gclient_variables": {
153+
"download_android_deps": false
154+
},
155+
"dependencies": [
156+
"host_debug"
157+
],
158+
"contexts": [
159+
"osx_sdk"
160+
],
161+
"tasks": [
162+
{
163+
"name": "test: lint host_debug",
164+
"parameters": [
165+
"--variant",
166+
"host_debug",
167+
"--lint-all",
168+
"--shard-id=3",
169+
"--shard-variants=host_debug,host_debug,host_debug"
170+
],
171+
"max_attempts": 1,
172+
"script": "flutter/ci/lint.sh"
173+
}
174+
]
175+
},
81176
{
82177
"name": "test: lint ios_debug_sim",
83178
"recipe": "engine_v2/tester_engine",

0 commit comments

Comments
 (0)