Skip to content

Allow downloading remote patches in parallel #27333

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow downloading remote patches in parallel #27333

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/test/tools/bzlmod/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions tools/build_defs/repo/utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,18 @@ def _use_native_patch(patch_args):
return True

def _download_patch(ctx, patch_url, integrity, auth = None):
name = patch_url.split("/")[-1]
# Prepend a hash to the filename to avoid potential collisions/races.
name = str(hash(patch_url)) + "-" + patch_url.split("/")[-1]
patch_path = ctx.path(_REMOTE_PATCH_DIR).get_child(name)
download_info = ctx.download(
token = ctx.download(
patch_url,
patch_path,
canonical_id = ctx.attr.canonical_id,
auth = get_auth(ctx, [patch_url]) if auth == None else auth,
integrity = integrity,
block = False,
)
return patch_path, download_info
return patch_path, token

def download_remote_files(ctx, auth = None):
"""Utility function for downloading remote files.
Expand Down Expand Up @@ -214,10 +216,13 @@ def patch(ctx, patches = None, patch_cmds = None, patch_cmds_win = None, patch_t
remote_patches_download_info = {}
for patch_url in remote_patches:
integrity = remote_patches[patch_url]
patchfile, download_info = _download_patch(ctx, patch_url, integrity, auth)
remote_patches_download_info[patch_url] = download_info
remote_patches_download_info[patch_url] = _download_patch(ctx, patch_url, integrity, auth)

for patch_url, (patchfile, token) in remote_patches_download_info.items():
remote_patches_download_info[patch_url] = token.wait()
ctx.patch(patchfile, remote_patch_strip)
ctx.delete(patchfile)

ctx.delete(ctx.path(_REMOTE_PATCH_DIR))

# Apply local patches
Expand Down