Skip to content

Don't consider system buck2 #12245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jathu merged 1 commit into from
Jul 7, 2025
Merged

Don't consider system buck2 #12245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions tools/cmake/resolve_buck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ def parse_args() -> argparse.Namespace:
def resolve_buck2(args: argparse.Namespace) -> Union[str, int]:
# Find buck2, in order of priority:
# 1) Explicit buck2 argument.
# 2) System buck2 (if correct version).
# 3) Cached buck2 (previously downloaded).
# 2) Cached buck2 (previously downloaded).
# 3) Download buck2.

# Read the target version (build date) from the CI pin file. Note that
Expand Down Expand Up @@ -160,26 +159,19 @@ def resolve_buck2(args: argparse.Namespace) -> Union[str, int]:
# such as a failed import, which exits with 1.
return 2
else:
# Look for system buck2 and check version. Note that this can return
# None.
ver = buck_util.get_buck2_version("buck2")
if ver == BUCK_TARGET_VERSION:
# Use system buck2.
return "buck2"
else:
# Download buck2 or used previously cached download.
cache_dir = Path(args.cache_dir)
os.makedirs(cache_dir, exist_ok=True)
# Download buck2 or used previously cached download.
cache_dir = Path(args.cache_dir)
os.makedirs(cache_dir, exist_ok=True)

buck2_local_path = (
(cache_dir / f"buck2-{BUCK_TARGET_VERSION}").absolute().as_posix()
)
buck2_local_path = (
(cache_dir / f"buck2-{BUCK_TARGET_VERSION}").absolute().as_posix()
)

# Check for a previously cached buck2 binary. The filename includes
# the version hash, so we don't have to worry about using an
# outdated binary, in the event that the target version is updated.
if os.path.isfile(buck2_local_path):
return buck2_local_path
# Check for a previously cached buck2 binary. The filename includes
# the version hash, so we don't have to worry about using an
# outdated binary, in the event that the target version is updated.
if os.path.isfile(buck2_local_path):
return buck2_local_path

buck2_archive_url = f"https://github.com/facebook/buck2/releases/download/{target_buck_version}/{buck_info.archive_name}"

Expand Down
Loading