bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

automate-git: Add support for depot_tools version pinning (fixes issue #2893)

This commit is contained in:
Marshall Greenblatt 2020-03-06 11:42:08 -05:00
parent 51e12b3866
commit 2fbb6ba1e9
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/automate/automate-git.py
View File

@ -404,15 +404,16 @@ def get_chromium_versions(commit):
return None return None
def get_chromium_compat_version(): def get_build_compat_versions():
""" Returns the compatible Chromium version specified by the CEF checkout. """ """ Returns the compatible Chromium and (optionally) depot_tools versions
specified by the CEF checkout. """
compat_path = os.path.join(cef_dir, 'CHROMIUM_BUILD_COMPATIBILITY.txt') compat_path = os.path.join(cef_dir, 'CHROMIUM_BUILD_COMPATIBILITY.txt')
msg("Reading %s" % compat_path) msg("Reading %s" % compat_path)
config = read_config_file(compat_path) config = read_config_file(compat_path)
if 'chromium_checkout' in config: if not 'chromium_checkout' in config:
return config['chromium_checkout'] raise Exception("Missing chromium_checkout value in %s" % (compat_path))
raise Exception("Missing chromium_checkout value in %s" % (compat_path)) return config
def get_chromium_target_version(os='win', channel='canary', target_distance=0): def get_chromium_target_version(os='win', channel='canary', target_distance=0):
@ -1213,6 +1214,19 @@ if not options.nocefupdate and os.path.exists(cef_dir):
else: else:
cef_checkout_changed = False cef_checkout_changed = False
build_compat_versions = get_build_compat_versions()
if not options.nodepottoolsupdate and \
'depot_tools_checkout' in build_compat_versions:
# Update the depot_tools checkout.
depot_tools_compat_version = build_compat_versions['depot_tools_checkout']
run('%s checkout %s%s' %
(git_exe, '--force ' if discard_local_changes else '', depot_tools_compat_version), \
depot_tools_dir, depot_tools_dir)
# Disable further depot_tools updates.
os.environ['DEPOT_TOOLS_UPDATE'] = '0'
## ##
# Manage the out directory. # Manage the out directory.
## ##
@ -1293,7 +1307,7 @@ if not options.nochromiumupdate and os.path.exists(chromium_src_dir):
run("%s fetch --tags" % (git_exe), chromium_src_dir, depot_tools_dir) run("%s fetch --tags" % (git_exe), chromium_src_dir, depot_tools_dir)
# Determine the Chromium checkout options required by CEF. # Determine the Chromium checkout options required by CEF.
chromium_compat_version = get_chromium_compat_version() chromium_compat_version = build_compat_versions['chromium_checkout']
if len(options.chromiumcheckout) > 0: if len(options.chromiumcheckout) > 0:
chromium_checkout = options.chromiumcheckout chromium_checkout = options.chromiumcheckout
elif len(options.chromiumchannel) > 0: elif len(options.chromiumchannel) > 0: