populate cache from base_retry

Summary: Enable cache upload for runs from base_retry on public commits

Reviewed By: bigfootjon

Differential Revision: D86308695

fbshipit-source-id: 1ebf1b18e89cc752634559e3c6041288d09b1358

Author: ahornby

build/fbcode_builder/getdeps.py

@@ -22,6 +22,7 @@
 from getdeps.errors import TransientFailure
 from getdeps.fetcher import (
     file_name_is_cmake_file,
+    is_public_commit,
     list_files_under_dir_newer_than_timestamp,
     SystemPackageFetcher,
 )
@@ -732,12 +733,13 @@ def run_project_cmd(self, args, loader, manifest):
 
                     # Only populate the cache from continuous build runs, and
                     # only if we have a built_marker.
-                    if (
-                        not args.skip_upload
-                        and args.schedule_type == "continuous"
-                        and has_built_marker
-                    ):
-                        cached_project.upload()
+                    if not args.skip_upload and has_built_marker:
+                        if args.schedule_type == "continuous":
+                            cached_project.upload()
+                        elif args.schedule_type == "base_retry":
+                            # Check if on public commit before uploading
+                            if is_public_commit(loader.build_opts):
+                                cached_project.upload()
                 elif args.verbose:
                     print("found good %s" % built_marker)
 
@@ -856,9 +858,6 @@ def setup_project_cmd_parser(self, parser):
             dest="use_build_cache",
             help="Do not attempt to use the build cache.",
         )
-        parser.add_argument(
-            "--schedule-type", help="Indicates how the build was activated"
-        )
         parser.add_argument(
             "--cmake-target",
             help=("Target for cmake build."),
@@ -944,9 +943,6 @@ def run_project_cmd(self, args, loader, manifest):
         )
 
     def setup_project_cmd_parser(self, parser):
-        parser.add_argument(
-            "--schedule-type", help="Indicates how the build was activated"
-        )
         parser.add_argument("--test-owner", help="Owner for testpilot")
         parser.add_argument("--filter", help="Only run the tests matching the regex")
         parser.add_argument(
@@ -1554,6 +1550,11 @@ def add_common_arg(*args, **kwargs):
             "version of the archive with a different hash"
         ),
     )
+    add_common_arg(
+        "--schedule-type",
+        nargs="?",
+        help="Indicates how the build was activated",
+    )
 
     ap = argparse.ArgumentParser(
         description="Get and build dependencies and projects", parents=[common_args]

build/fbcode_builder/getdeps/builder.py

@@ -703,6 +703,7 @@ def __init__(
         self.loader = loader
         if build_opts.shared_libs:
             self.defines["BUILD_SHARED_LIBS"] = "ON"
+            self.defines["BOOST_LINK_STATIC"] = "OFF"
 
     def _invalidate_cache(self) -> None:
         for name in [

build/fbcode_builder/getdeps/fetcher.py

@@ -564,6 +564,97 @@ def get_fbsource_repo_data(build_options) -> FbsourceRepoData:
     return cached_data
 
 
+def is_public_commit(build_options) -> bool:  # noqa: C901
+    """Check if the current commit is public (shipped/will be shipped to remote).
+
+    Works across git, sapling (sl), and hg repositories:
+    - For hg/sapling: Uses 'phase' command to check if commit is public
+    - For git: Checks if commit exists in remote branches
+
+    Returns True if public, False if draft/local-only or on error (conservative).
+    """
+    # Use fbsource_dir if available (Meta internal), otherwise fall back to repo_root
+    repo_dir = build_options.fbsource_dir or build_options.repo_root
+    if not repo_dir:
+        # No repository detected, be conservative
+        return False
+
+    env = Env()
+    env.set("HGPLAIN", "1")
+    env_dict = dict(env.items())
+
+    try:
+        # Try hg/sapling phase command first (works for both hg and sl)
+        # Try 'sl' first as it's the preferred tool at Meta
+        for cmd in [["sl", "phase", "-r", "."], ["hg", "phase", "-r", "."]]:
+            try:
+                output = (
+                    subprocess.check_output(
+                        cmd, cwd=repo_dir, env=env_dict, stderr=subprocess.DEVNULL
+                    )
+                    .decode("ascii")
+                    .strip()
+                )
+                # Output format: "hash: public" or "hash: draft"
+                return "public" in output
+            except (subprocess.CalledProcessError, FileNotFoundError):
+                continue
+
+        # Try git if hg/sl didn't work
+        try:
+            # Detect the default branch for origin remote
+            default_branch = None
+            try:
+                # Get the symbolic ref for origin/HEAD to find default branch
+                output = (
+                    subprocess.check_output(
+                        ["git", "symbolic-ref", "refs/remotes/origin/HEAD"],
+                        cwd=repo_dir,
+                        stderr=subprocess.DEVNULL,
+                    )
+                    .decode("ascii")
+                    .strip()
+                )
+                # Output format: "refs/remotes/origin/main"
+                if output.startswith("refs/remotes/"):
+                    default_branch = output
+            except subprocess.CalledProcessError:
+                # If symbolic-ref fails, fall back to common names
+                pass
+
+            # Build list of branches to check
+            branches_to_check = []
+            if default_branch:
+                branches_to_check.append(default_branch)
+            # Also try common defaults as fallback
+            branches_to_check.extend(["origin/main", "origin/master"])
+
+            # Check if HEAD is an ancestor of any of these branches
+            for branch in branches_to_check:
+                try:
+                    subprocess.check_output(
+                        ["git", "merge-base", "--is-ancestor", "HEAD", branch],
+                        cwd=repo_dir,
+                        stderr=subprocess.DEVNULL,
+                    )
+                    # If command succeeds (exit 0), HEAD is an ancestor of the branch
+                    return True
+                except subprocess.CalledProcessError:
+                    # Not an ancestor of this branch, try next
+                    continue
+            # HEAD is not in any default branch
+            return False
+        except FileNotFoundError:
+            pass
+
+        # If all VCS commands failed, be conservative and don't upload
+        return False
+
+    except Exception:
+        # On any unexpected error, be conservative and don't upload
+        return False
+
+
 class SimpleShipitTransformerFetcher(Fetcher):
     def __init__(self, build_options, manifest, ctx) -> None:
         self.build_options = build_options

build/fbcode_builder/manifests/folly

@@ -63,6 +63,8 @@ fbcode/folly = folly
 
 [cmake.defines]
 BUILD_SHARED_LIBS=OFF
+
+[cmake.defines.not(os=windows)]
 BOOST_LINK_STATIC=ON
 
 [cmake.defines.os=freebsd]