Call goma_ctl update_hook only after python3 is bootstrapped.

goma_ctl.bat requires python3 to be available, otherwise we get this:
'"\python3.exe"' is not recognized as an internal or external command.

Change-Id: I60734f8f5fb878eff451de9dad13531ac360480a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4532006
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Auto-Submit: Aleksey Khoroshilov <akhoroshilov@brave.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
changes/06/4532006/6
Aleksey Khoroshilov 2 years ago committed by LUCI CQ
parent e27d7c3816
commit 44c05276d7

@ -143,14 +143,14 @@ if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
source "$base_dir/cipd_bin_setup.sh"
cipd_bin_setup
# Restart goma if it is updated.
goma_ctl update_hook
# Don't bootstrap Python 3 on windows, since it is already done by
# bootstrap/win_tools.bat.
if [ "X$MINGW" != "X0" -a "X$DEPOT_TOOLS_BOOTSTRAP_PYTHON3" != "X0" ]; then
source "$base_dir/bootstrap_python3"
bootstrap_python3
fi
# Restart goma if it is updated.
goma_ctl update_hook
fi

@ -81,8 +81,8 @@ if errorlevel 1 (
:: Sync CIPD and CIPD client tools.
call "%~dp0\cipd_bin_setup.bat"
:: Update git and python.
call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"
:: Restart goma if it is updated.
call "%~dp0\goma_ctl.bat" update_hook
:: Update git and python
call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"

Loading…
Cancel
Save