Shallow support modifications to automate-git does not seem to actually work and not enabled by default

Author: mitchcapper

Dockerfile_cef

@@ -17,7 +17,7 @@ ARG CHROME_BRANCH=3239
 RUN setX /M DEPOT_TOOLS_WIN_TOOLCHAIN 0;setX /M GYP_MSVS_VERSION "$env:GN_DEFINES";setx /M GN_DEFINES "$env:GN_DEFINES";setx /M GN_ARGUMENTS "$env:GN_ARGUMENTS";setx /M GYP_DEFINES "$env:GYP_DEFINES";setx /M DUAL_BUILD "$env:DUAL_BUILD";setx /M BINARY_EXT "$env:BINARY_EXT";setx /M ARCHES "$env:ARCHES";setx /M CEF_SAVE_SOURCES "$env:CEF_SAVE_SOURCES";setx /M CHROME_BRANCH "$env:CHROME_BRANCH";
 
 ADD https://bitbucket.org/chromiumembedded/cef/raw/master/tools/automate/automate-git.py c:/code/automate/
-ADD automate-git.py c:/code/automate/
+#ADD automate-git-shallow-support.py c:/code/automate/automate-git.py
 RUN cd c:/code/depot_tools/;./update_depot_tools.bat;./update_depot_tools.bat;
 RUN $env:Path = 'c:/code/depot_tools/;' + $env:Path;setx /M PATH $env:Path;
 ADD functions.ps1 cef_build.ps1 cef_patch.ps1 cef_patch_*.diff c:/code/

automate-git-shallow-support.py

@@ -36,6 +36,14 @@
 
 chromium_channel_json_url = 'https://omahaproxy.appspot.com/all.json'
 
+shallow_git_depth_limit = ''
+shallow_gclient_no_history = ''
+
+if os.environ.get('SHALLOW') == '1':
+	shallow_gclient_no_history = '--no-history'
+	shallow_git_depth_limit = '--depth 1'
+
+
 ##
 # Global system variables.
 ##
@@ -182,7 +190,7 @@ def download_and_extract(src, target):
   """ Extracts the contents of src, which may be a URL or local file, to the
       target directory. """
   temporary = False
-
+  sys.stdout.write("-------- downloading and extracting \"%s\" to \"%s\"...\n" % (src, target))
   if src[:4] == 'http':
     # Attempt to download a URL.
     opener = FancyURLopener({})
@@ -1181,7 +1189,7 @@ def check_pattern_matches(output_file=None):
 # Create the CEF checkout if necessary.
 if not options.nocefupdate and not os.path.exists(cef_dir):
   cef_checkout_new = True
-  run('%s clone %s %s' % (git_exe, cef_url, cef_dir), download_dir,
+  run('%s clone %s %s %s' % (git_exe,shallow_git_depth_limit, cef_url, cef_dir), download_dir,
       depot_tools_dir)
 else:
   cef_checkout_new = False
@@ -1191,8 +1199,8 @@ def check_pattern_matches(output_file=None):
   cef_current_hash = get_git_hash(cef_dir, 'HEAD')
 
   if not cef_checkout_new:
-    # Fetch updated sources.
-    run('%s fetch' % (git_exe), cef_dir, depot_tools_dir)
+    # fetch --depth 1 updated sources.
+    run('%s fetch %s' % (git_exe, shallow_git_depth_limit), cef_dir, depot_tools_dir)
 
   cef_desired_hash = get_git_hash(cef_dir, cef_checkout)
   cef_checkout_changed = cef_checkout_new or force_change or \
@@ -1287,7 +1295,7 @@ def check_pattern_matches(output_file=None):
 # Initial Chromium checkout.
 if not options.nochromiumupdate and not os.path.exists(chromium_src_dir):
   chromium_checkout_new = True
-  run("gclient sync --nohooks --with_branch_heads --jobs 16", \
+  run("gclient sync " + shallow_gclient_no_history + " --nohooks --with_branch_heads --jobs 16", \
       chromium_dir, depot_tools_dir)
 else:
   chromium_checkout_new = False
@@ -1299,13 +1307,13 @@ def check_pattern_matches(output_file=None):
 if os.path.exists(chromium_src_dir):
   msg("Chromium URL: %s" % (get_git_url(chromium_src_dir)))
 
-# Fetch Chromium changes so that we can perform the necessary calculations using
+# fetch Chromium changes so that we can perform the necessary calculations using
 # local history.
 if not options.nochromiumupdate and os.path.exists(chromium_src_dir):
-  # Fetch updated sources.
-  run("%s fetch" % (git_exe), chromium_src_dir, depot_tools_dir)
+  # fetch --depth 1 updated sources.
+  run("%s fetch %s" % (git_exe,shallow_git_depth_limit), chromium_src_dir, depot_tools_dir)
   # Also fetch tags, which are required for release branch builds.
-  run("%s fetch --tags" % (git_exe), chromium_src_dir, depot_tools_dir)
+  run("%s fetch %s --tags" % (git_exe,shallow_git_depth_limit), chromium_src_dir, depot_tools_dir)
 
 # Determine the Chromium checkout options required by CEF.
 chromium_compat_version = build_compat_versions['chromium_checkout']
@@ -1375,7 +1383,7 @@ def check_pattern_matches(output_file=None):
   apply_deps_patch()
 
   # Update third-party dependencies including branch/tag information.
-  run("gclient sync %s--nohooks --with_branch_heads --jobs 16" % \
+  run("gclient sync " + shallow_gclient_no_history + " %s--nohooks --with_branch_heads --jobs 16" % \
       ('--reset ' if discard_local_changes else ''), chromium_dir, depot_tools_dir)
 
   # Patch the Chromium runhooks scripts if necessary.

cef_build.ps1

@@ -67,12 +67,12 @@ Function RunBuild{
     return RunProc -verbose_mode "host" -proc "c:/code/depot_tools/ninja.exe" -opts "$build_args_add -C out/Release_GN_$version cefclient" -no_wait;
 }
 
-$chrome_data = Invoke-RestMethod -Uri 'https://omahaproxy.appspot.com/all.json'
-$win_data = $chrome_data | Where  { $_.os -eq "win64"} | Select -First 1
-$branch_data = $win_data.versions | Where {$_.true_branch -eq $env:CHROME_BRANCH} | Select -First 1
-$latest_tag = $branch_data.version
-
 if ($Env:SHALLOW -eq "1"){
+	$chrome_data = Invoke-RestMethod -Uri 'https://omahaproxy.appspot.com/all.json'
+	$win_data = $chrome_data | Where  { $_.os -eq "win64"} | Select -First 1
+	$branch_data = $win_data.versions | Where {$_.true_branch -eq $env:CHROME_BRANCH} | Select -First 1
+	$latest_tag = $branch_data.version
+	
 	if (! (Test-Path /code/chromium_git/cef/.git)){ #we will manually clone this out first time or wont be on right branch
 		Runproc -proc "c:/code/depot_tools/git.bat" -opts "clone --depth 1 --branch $env:CHROME_BRANCH https://bitbucket.org/chromiumembedded/cef.git c:/code/chromium_git/cef"; #as shallow fails if they don't speify the branch so we will do it first for them
 	}