Skip to content

Commit 74896e3

Browse files
sinanoz-googledart-scoped@luci-project-accounts.iam.gserviceaccount.com
authored andcommitted
analysis-server: fixed benchmark uploader for Windows benchmarks
Change-Id: Iae46a7f6f755c8e0d217c2f7f18d84551c18193c Cq-Include-Trybots: luci.dart.try:analyzer-win-release-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/548200 Reviewed-by: Alexander Thomas <athom@google.com> Commit-Queue: Sinan Oz <sinanoz@google.com>
1 parent 0f92a64 commit 74896e3

2 files changed

Lines changed: 23 additions & 4 deletions

File tree

‎DEPS‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ vars = {
7979
"jsshell_tag": "version:155.0.1",
8080
"jsc_tag": "version:320707",
8181

82+
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/gcloud
83+
"gcloud_version": "version:3@584.0.0.chromium.4",
84+
8285
# https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang
8386
"clang_version": "git_revision:5e63f2ce42db2c42f1d0012a3b5fa9c6113f750a",
8487

@@ -297,6 +300,14 @@ deps = {
297300
"dep_type": "cipd",
298301
},
299302

303+
Var("dart_root") + "/third_party/gcloud": {
304+
"packages": [{
305+
"package": "infra/3pp/tools/gcloud/${{platform}}",
306+
"version": Var("gcloud_version"),
307+
}],
308+
"dep_type": "cipd"
309+
},
310+
300311
Var("dart_root") + "/third_party/emsdk":
301312
Var("dart_git") + "external/github.com/emscripten-core/emsdk.git" +
302313
"@" + Var("emsdk_rev"),

‎pkg/analysis_server/benchmark/perf/benchmark_uploader.dart‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,18 @@ Future<void> uploadResults(List<Map<String, dynamic>> results) async {
109109
}
110110
var cloudStoragePath =
111111
'gs://dart-test-results/benchmarks/$taskId/results.json';
112-
var args = ['gcloud', 'storage', 'cp', resultsFile.path, cloudStoragePath];
113-
var python = 'python3.exe';
114-
print('Running $python ${args.join(' ')}');
115-
var commandResult = await Process.run(python, args);
112+
var args = ['storage', 'cp', resultsFile.path, cloudStoragePath];
113+
var gcloudSuffix = Platform.isWindows ? '.cmd' : '';
114+
var gcloud = Platform.script
115+
.resolve('../../../../third_party/gcloud/bin/gcloud$gcloudSuffix')
116+
.toFilePath();
117+
118+
print('Running $gcloud ${args.join(' ')}');
119+
var commandResult = await Process.run(
120+
gcloud,
121+
args,
122+
runInShell: Platform.isWindows,
123+
);
116124
var exitCode = commandResult.exitCode;
117125
print(commandResult.stdout);
118126
print(commandResult.stderr);

0 commit comments

Comments
 (0)