Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2ce8e6f

Browse files
zandersozanderso
committed
Prefix non-local build config names with ci/
1 parent 2f5afdf commit 2ce8e6f

35 files changed

Lines changed: 802 additions & 557 deletions

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ allowed_hosts = [
289289
]
290290

291291
deps = {
292-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'bce07474ce354afc8ea6bb1b695cc86ef376260d',
292+
'src': 'https://github.com/zanderso/buildroot.git' + '@' + '130d1d2f2cf012e9d28e4f8d4ce32551847e9bfd',
293293

294294
'src/flutter/third_party/depot_tools':
295295
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',

‎build/copy_info_plist.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
Copies the Info.plist and adds extra fields to it like the git hash of the
99
engine.
1010
11-
Precondition: $CWD/../../flutter is the path to the flutter engine repo.
12-
1311
usage: copy_info_plist.py --source <src_path> --destination <dest_path>
1412
--minversion=<deployment_target>
1513
"""
@@ -20,10 +18,13 @@
2018

2119
import git_revision
2220

21+
_script_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..'))
22+
_src_root_dir = os.path.join(_script_dir, '..', '..')
23+
2324

2425
def get_clang_version():
2526
clang_executable = str(
26-
os.path.join('..', '..', 'flutter', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++')
27+
os.path.join(_src_root_dir, 'flutter', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++')
2728
)
2829
version = subprocess.check_output([clang_executable, '--version'])
2930
return version.splitlines()[0]
@@ -47,7 +48,7 @@ def main():
4748
args = parser.parse_args()
4849

4950
text = open(args.source).read()
50-
engine_path = os.path.join(os.getcwd(), '..', '..', 'flutter')
51+
engine_path = os.path.join(_src_root_dir, 'flutter')
5152
revision = git_revision.get_repository_version(engine_path)
5253
clang_version = get_clang_version()
5354
text = text.format(revision=revision, clang_version=clang_version, min_version=args.minversion)

‎ci/analyze.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ FLUTTER_DIR="$SRC_DIR/flutter"
3535
# directory. If not specified, we default to the build output for
3636
# host_debug_unopt.
3737
if [[ $# -eq 0 ]] ; then
38-
DART_BIN="$SRC_DIR/out/host_debug_unopt/dart-sdk/bin"
38+
DART_BIN="$SRC_DIR/out/host_debug_unopt/dart-sdk/bin"
39+
if [[ ! -d "$DART_BIN" ]]; then
40+
DART_BIN="$SRC_DIR/out/ci/host_debug_unopt/dart-sdk/bin"
41+
fi
3942
else
40-
DART_BIN="$1"
43+
DART_BIN="$1"
4144
fi
4245

4346
DART="$DART_BIN/dart"

‎ci/builders/linux_android_aot_engine.json‎

Lines changed: 68 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
{
44
"archives": [
55
{
6-
"name": "android_profile",
6+
"name": "ci/android_profile",
77
"type": "gcs",
8-
"base_path": "out/android_profile/zip_archives/",
8+
"base_path": "out/ci/android_profile/zip_archives/",
99
"include_paths": [
10-
"out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
11-
"out/android_profile/zip_archives/android-arm-profile/linux-x64.zip",
12-
"out/android_profile/zip_archives/android-arm-profile/symbols.zip",
13-
"out/android_profile/zip_archives/download.flutter.io"
10+
"out/ci/android_profile/zip_archives/android-arm-profile/artifacts.zip",
11+
"out/ci/android_profile/zip_archives/android-arm-profile/linux-x64.zip",
12+
"out/ci/android_profile/zip_archives/android-arm-profile/symbols.zip",
13+
"out/ci/android_profile/zip_archives/download.flutter.io"
1414
],
1515
"realm": "production"
1616
}
@@ -23,6 +23,8 @@
2323
"use_rbe": true
2424
},
2525
"gn": [
26+
"--target-dir",
27+
"ci/android_profile",
2628
"--runtime-mode",
2729
"profile",
2830
"--android",
@@ -31,9 +33,9 @@
3133
"--rbe",
3234
"--no-goma"
3335
],
34-
"name": "android_profile",
36+
"name": "ci/android_profile",
3537
"ninja": {
36-
"config": "android_profile",
38+
"config": "ci/android_profile",
3739
"targets": [
3840
"default",
3941
"clang_x64/gen_snapshot",
@@ -45,14 +47,14 @@
4547
{
4648
"archives": [
4749
{
48-
"name": "android_release",
50+
"name": "ci/android_release",
4951
"type": "gcs",
50-
"base_path": "out/android_release/zip_archives/",
52+
"base_path": "out/ci/android_release/zip_archives/",
5153
"include_paths": [
52-
"out/android_release/zip_archives/android-arm-release/artifacts.zip",
53-
"out/android_release/zip_archives/android-arm-release/linux-x64.zip",
54-
"out/android_release/zip_archives/android-arm-release/symbols.zip",
55-
"out/android_release/zip_archives/download.flutter.io"
54+
"out/ci/android_release/zip_archives/android-arm-release/artifacts.zip",
55+
"out/ci/android_release/zip_archives/android-arm-release/linux-x64.zip",
56+
"out/ci/android_release/zip_archives/android-arm-release/symbols.zip",
57+
"out/ci/android_release/zip_archives/download.flutter.io"
5658
],
5759
"realm": "production"
5860
}
@@ -65,6 +67,8 @@
6567
"use_rbe": true
6668
},
6769
"gn": [
70+
"--target-dir",
71+
"ci/android_release",
6872
"--runtime-mode",
6973
"release",
7074
"--android",
@@ -73,9 +77,9 @@
7377
"--rbe",
7478
"--no-goma"
7579
],
76-
"name": "android_release",
80+
"name": "ci/android_release",
7781
"ninja": {
78-
"config": "android_release",
82+
"config": "ci/android_release",
7983
"targets": [
8084
"default",
8185
"clang_x64/gen_snapshot",
@@ -87,15 +91,15 @@
8791
{
8892
"archives": [
8993
{
90-
"name": "android_release_arm64",
94+
"name": "ci/android_release_arm64",
9195
"type": "gcs",
92-
"base_path": "out/android_release_arm64/zip_archives/",
96+
"base_path": "out/ci/android_release_arm64/zip_archives/",
9397
"include_paths": [
94-
"out/android_release_arm64/zip_archives/android-arm64-release/artifacts.zip",
95-
"out/android_release_arm64/zip_archives/android-arm64-release/linux-x64.zip",
96-
"out/android_release_arm64/zip_archives/android-arm64-release/symbols.zip",
97-
"out/android_release_arm64/zip_archives/android-arm64-release/analyze-snapshot-linux-x64.zip",
98-
"out/android_release_arm64/zip_archives/download.flutter.io"
98+
"out/ci/android_release_arm64/zip_archives/android-arm64-release/artifacts.zip",
99+
"out/ci/android_release_arm64/zip_archives/android-arm64-release/linux-x64.zip",
100+
"out/ci/android_release_arm64/zip_archives/android-arm64-release/symbols.zip",
101+
"out/ci/android_release_arm64/zip_archives/android-arm64-release/analyze-snapshot-linux-x64.zip",
102+
"out/ci/android_release_arm64/zip_archives/download.flutter.io"
99103
],
100104
"realm": "production"
101105
}
@@ -108,6 +112,8 @@
108112
"use_rbe": true
109113
},
110114
"gn": [
115+
"--target-dir",
116+
"ci/android_release_arm64",
111117
"--runtime-mode",
112118
"release",
113119
"--android",
@@ -116,9 +122,9 @@
116122
"--rbe",
117123
"--no-goma"
118124
],
119-
"name": "android_release_arm64",
125+
"name": "ci/android_release_arm64",
120126
"ninja": {
121-
"config": "android_release_arm64",
127+
"config": "ci/android_release_arm64",
122128
"targets": [
123129
"default",
124130
"clang_x64/gen_snapshot",
@@ -132,7 +138,7 @@
132138
"language": "bash",
133139
"script": "flutter/ci/binary_size_treemap.sh",
134140
"parameters": [
135-
"../../src/out/android_release_arm64/libflutter.so",
141+
"../../src/out/ci/android_release_arm64/libflutter.so",
136142
"${FLUTTER_LOGS_DIR}"
137143
]
138144
}
@@ -141,15 +147,15 @@
141147
{
142148
"archives": [
143149
{
144-
"name": "android_profile_arm64",
150+
"name": "ci/android_profile_arm64",
145151
"type": "gcs",
146-
"base_path": "out/android_profile_arm64/zip_archives/",
152+
"base_path": "out/ci/android_profile_arm64/zip_archives/",
147153
"include_paths": [
148-
"out/android_profile_arm64/zip_archives/android-arm64-profile/artifacts.zip",
149-
"out/android_profile_arm64/zip_archives/android-arm64-profile/linux-x64.zip",
150-
"out/android_profile_arm64/zip_archives/android-arm64-profile/symbols.zip",
151-
"out/android_profile_arm64/zip_archives/android-arm64-profile/analyze-snapshot-linux-x64.zip",
152-
"out/android_profile_arm64/zip_archives/download.flutter.io"
154+
"out/ci/android_profile_arm64/zip_archives/android-arm64-profile/artifacts.zip",
155+
"out/ci/android_profile_arm64/zip_archives/android-arm64-profile/linux-x64.zip",
156+
"out/ci/android_profile_arm64/zip_archives/android-arm64-profile/symbols.zip",
157+
"out/ci/android_profile_arm64/zip_archives/android-arm64-profile/analyze-snapshot-linux-x64.zip",
158+
"out/ci/android_profile_arm64/zip_archives/download.flutter.io"
153159
],
154160
"realm": "production"
155161
}
@@ -162,6 +168,8 @@
162168
"use_rbe": true
163169
},
164170
"gn": [
171+
"--target-dir",
172+
"ci/android_profile_arm64",
165173
"--android",
166174
"--runtime-mode",
167175
"profile",
@@ -170,9 +178,9 @@
170178
"--rbe",
171179
"--no-goma"
172180
],
173-
"name": "android_profile_arm64",
181+
"name": "ci/android_profile_arm64",
174182
"ninja": {
175-
"config": "android_profile_arm64",
183+
"config": "ci/android_profile_arm64",
176184
"targets": [
177185
"clang_x64/gen_snapshot",
178186
"default",
@@ -192,7 +200,7 @@
192200
"script": "flutter/ci/firebase_testlab.py",
193201
"parameters": [
194202
"--variant",
195-
"android_profile_arm64"
203+
"ci/android_profile_arm64"
196204
],
197205
"test_if": "main"
198206
}
@@ -201,15 +209,15 @@
201209
{
202210
"archives": [
203211
{
204-
"name": "android_profile_x64",
212+
"name": "ci/android_profile_x64",
205213
"type": "gcs",
206-
"base_path": "out/android_profile_x64/zip_archives/",
214+
"base_path": "out/ci/android_profile_x64/zip_archives/",
207215
"include_paths": [
208-
"out/android_profile_x64/zip_archives/android-x64-profile/artifacts.zip",
209-
"out/android_profile_x64/zip_archives/android-x64-profile/linux-x64.zip",
210-
"out/android_profile_x64/zip_archives/android-x64-profile/symbols.zip",
211-
"out/android_profile_x64/zip_archives/android-x64-profile/analyze-snapshot-linux-x64.zip",
212-
"out/android_profile_x64/zip_archives/download.flutter.io"
216+
"out/ci/android_profile_x64/zip_archives/android-x64-profile/artifacts.zip",
217+
"out/ci/android_profile_x64/zip_archives/android-x64-profile/linux-x64.zip",
218+
"out/ci/android_profile_x64/zip_archives/android-x64-profile/symbols.zip",
219+
"out/ci/android_profile_x64/zip_archives/android-x64-profile/analyze-snapshot-linux-x64.zip",
220+
"out/ci/android_profile_x64/zip_archives/download.flutter.io"
213221
],
214222
"realm": "production"
215223
}
@@ -222,6 +230,8 @@
222230
"use_rbe": true
223231
},
224232
"gn": [
233+
"--target-dir",
234+
"ci/android_profile_x64",
225235
"--runtime-mode",
226236
"profile",
227237
"--android",
@@ -230,9 +240,9 @@
230240
"--rbe",
231241
"--no-goma"
232242
],
233-
"name": "android_profile_x64",
243+
"name": "ci/android_profile_x64",
234244
"ninja": {
235-
"config": "android_profile_x64",
245+
"config": "ci/android_profile_x64",
236246
"targets": [
237247
"default",
238248
"clang_x64/gen_snapshot",
@@ -244,15 +254,15 @@
244254
{
245255
"archives": [
246256
{
247-
"name": "android_release_x64",
257+
"name": "ci/android_release_x64",
248258
"type": "gcs",
249-
"base_path": "out/android_release_x64/zip_archives/",
259+
"base_path": "out/ci/android_release_x64/zip_archives/",
250260
"include_paths": [
251-
"out/android_release_x64/zip_archives/android-x64-release/artifacts.zip",
252-
"out/android_release_x64/zip_archives/android-x64-release/linux-x64.zip",
253-
"out/android_release_x64/zip_archives/android-x64-release/symbols.zip",
254-
"out/android_release_x64/zip_archives/android-x64-release/analyze-snapshot-linux-x64.zip",
255-
"out/android_release_x64/zip_archives/download.flutter.io"
261+
"out/ci/android_release_x64/zip_archives/android-x64-release/artifacts.zip",
262+
"out/ci/android_release_x64/zip_archives/android-x64-release/linux-x64.zip",
263+
"out/ci/android_release_x64/zip_archives/android-x64-release/symbols.zip",
264+
"out/ci/android_release_x64/zip_archives/android-x64-release/analyze-snapshot-linux-x64.zip",
265+
"out/ci/android_release_x64/zip_archives/download.flutter.io"
256266
],
257267
"realm": "production"
258268
}
@@ -265,6 +275,8 @@
265275
"use_rbe": true
266276
},
267277
"gn": [
278+
"--target-dir",
279+
"ci/android_release_x64",
268280
"--runtime-mode",
269281
"release",
270282
"--android",
@@ -273,9 +285,9 @@
273285
"--rbe",
274286
"--no-goma"
275287
],
276-
"name": "android_release_x64",
288+
"name": "ci/android_release_x64",
277289
"ninja": {
278-
"config": "android_release_x64",
290+
"config": "ci/android_release_x64",
279291
"targets": [
280292
"default",
281293
"clang_x64/gen_snapshot",
@@ -290,7 +302,8 @@
290302
{
291303
"name": "Verify-export-symbols-release-binaries",
292304
"parameters": [
293-
"src/out"
305+
"src/out/ci",
306+
"src/flutter/buildtools"
294307
],
295308
"script": "flutter/testing/symbols/verify_exported.dart",
296309
"language": "dart"

0 commit comments

Comments
 (0)