diff --git a/DEPS b/DEPS index c7d69b5a314..baa4a3b4354 100644 --- a/DEPS +++ b/DEPS @@ -144,7 +144,7 @@ vars = { "sync_http_rev": "dc54465f07d9652875deeade643256dafa2fbc6c", "tar_rev": "5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a", "test_rev": "42a6d333d96b4b0964d356b9a29ca47ccdb43691", - "tools_rev": "be0bd20c803377063c45904512f272fdda94e8c3", + "tools_rev": "a433200cf62b2da0a02602f138ae25d61b63739c", "vector_math_rev": "13f185f7e97d559e003f5ac79201da12f9a01049", "web_rev": "f1becf07db9faa56559d2844c3c6d430dc9b37de", "webdev_rev": "5dbb30ebc695ad2ecc01fa8eae4e0494c199e1bc", diff --git a/tools/rev_sdk_deps.dart b/tools/rev_sdk_deps.dart index 6584dca8570..c34143ff761 100644 --- a/tools/rev_sdk_deps.dart +++ b/tools/rev_sdk_deps.dart @@ -218,14 +218,25 @@ class GitHelper { } class GClientHelper { + Future execGclient( + List cmd, { + String? cwd, + Map? environment, + }) { + return exec( + [Platform.isWindows ? 'gclient.bat' : 'gclient', ...cmd], + cwd: cwd, + environment: environment, + ); + } + Future> getPackageDependencies() async { // gclient revinfo --output-json= --ignore-dep-type=cipd final tempDir = Directory.systemTemp.createTempSync(); final outFile = File(path.join(tempDir.path, 'deps.json')); - await exec([ - 'gclient', + await execGclient([ 'revinfo', '--output-json=${outFile.path}', '--ignore-dep-type=cipd', @@ -247,9 +258,8 @@ class GClientHelper { Future getHash(PackageDependency dep) async { // DEPOT_TOOLS_UPDATE=0 gclient getdep --var=path_rev var depName = dep.name; - var result = await exec( + var result = await execGclient( [ - 'gclient', 'getdep', '--var=${depName}_rev', ], @@ -263,9 +273,8 @@ class GClientHelper { Future setHash(PackageDependency dep, String hash) async { // gclient setdep --var=args_rev=9879dsf7g9d87d9f8g7 var depName = dep.name; - return await exec( + return await execGclient( [ - 'gclient', 'setdep', '--var=${depName}_rev=$hash', ],