From 2cbf79f3c976c392242cb2e8710d397ad1ee1762 Mon Sep 17 00:00:00 2001 From: "phajdan.jr" Date: Fri, 19 Aug 2016 06:58:34 -0700 Subject: [PATCH] git: use new python script to bootstrap git on windows BUG=635421, 629679 Recipe-Tryjob-Bypass-Reason: downstream changes expected Review-Url: https://codereview.chromium.org/2264583002 --- recipe_modules/git/api.py | 5 +++-- recipe_modules/git/example.expected/platform_win.json | 5 ++++- .../tryserver/example.expected/with_wrong_patch.json | 5 ++++- .../tryserver/example.expected/with_wrong_patch_new.json | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/recipe_modules/git/api.py b/recipe_modules/git/api.py index d20f8a4da..dddb1de80 100644 --- a/recipe_modules/git/api.py +++ b/recipe_modules/git/api.py @@ -41,9 +41,10 @@ class GitApi(recipe_api.RecipeApi): """Ensures that depot_tools/git.bat actually exists.""" if not self.m.platform.is_win or self.initialized_win_git: return - self.m.step( + self.m.python( 'ensure git tooling on windows', - [self.package_repo_resource('bootstrap', 'win', 'win_tools.bat')], + self.package_repo_resource('bootstrap', 'win', 'git_bootstrap.py'), + ['--verbose'], infra_step=True, cwd=self.package_repo_resource(), timeout=300) diff --git a/recipe_modules/git/example.expected/platform_win.json b/recipe_modules/git/example.expected/platform_win.json index d9d15429b..b12b3b0c6 100644 --- a/recipe_modules/git/example.expected/platform_win.json +++ b/recipe_modules/git/example.expected/platform_win.json @@ -1,7 +1,10 @@ [ { "cmd": [ - "RECIPE_PACKAGE_REPO[depot_tools]\\bootstrap\\win\\win_tools.bat" + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]\\bootstrap\\win\\git_bootstrap.py", + "--verbose" ], "cwd": "RECIPE_PACKAGE_REPO[depot_tools]", "name": "ensure git tooling on windows", diff --git a/recipe_modules/tryserver/example.expected/with_wrong_patch.json b/recipe_modules/tryserver/example.expected/with_wrong_patch.json index 2479712e6..47a6d1e35 100644 --- a/recipe_modules/tryserver/example.expected/with_wrong_patch.json +++ b/recipe_modules/tryserver/example.expected/with_wrong_patch.json @@ -1,7 +1,10 @@ [ { "cmd": [ - "RECIPE_PACKAGE_REPO[depot_tools]\\bootstrap\\win\\win_tools.bat" + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]\\bootstrap\\win\\git_bootstrap.py", + "--verbose" ], "cwd": "RECIPE_PACKAGE_REPO[depot_tools]", "name": "ensure git tooling on windows", diff --git a/recipe_modules/tryserver/example.expected/with_wrong_patch_new.json b/recipe_modules/tryserver/example.expected/with_wrong_patch_new.json index ac0bf7974..d7c7a8a4e 100644 --- a/recipe_modules/tryserver/example.expected/with_wrong_patch_new.json +++ b/recipe_modules/tryserver/example.expected/with_wrong_patch_new.json @@ -1,7 +1,10 @@ [ { "cmd": [ - "RECIPE_PACKAGE_REPO[depot_tools]\\bootstrap\\win\\win_tools.bat" + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]\\bootstrap\\win\\git_bootstrap.py", + "--verbose" ], "cwd": "RECIPE_PACKAGE_REPO[depot_tools]", "name": "ensure git tooling on windows",