Skip to content
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.

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

Optimise copying of data inputs in npm_install and yarn_install #41

Merged
merged 2 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions internal/npm_install/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ bzl_library(
visibility = ["//visibility:public"],
)

# Exported to be consumed for generating stardoc.
exports_files(["npm_install.bzl"])
exports_files([
"bulk_copy.sh",
# Exported to be consumed for generating stardoc.
"npm_install.bzl",
])

filegroup(
name = "generate_build_file",
Expand Down
12 changes: 12 additions & 0 deletions internal/npm_install/bulk_copy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

set -eu -o pipefail

# The list of files to copy, relative to base so directories are preserved
input_files_list="$1"
# The base path which input files will be resolved from
input_files_base="$2"
# Destination directory for files
out_dir="$3"

tar --create --file - --directory "$input_files_base" --files-from "$input_files_list" | tar --extract --file - --directory "$out_dir"
40 changes: 33 additions & 7 deletions internal/npm_install/npm_install.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -516,13 +516,37 @@ def _symlink_file(repository_ctx, f):

def _copy_data_dependencies(repository_ctx):
"""Add data dependencies to the repository."""
total = len(repository_ctx.attr.data)
for i, f in enumerate(repository_ctx.attr.data):
repository_ctx.report_progress("Copying data dependencies (%s/%s)" % (i, total))
# Make copies of the data files instead of symlinking
# as yarn under linux will have trouble using symlinked
# files as npm file:// packages
_copy_file(repository_ctx, f)
# Collect inputs
input_files_list = []
input_files_base = str(repository_ctx.workspace_root)
for label in repository_ctx.attr.data:
if label.workspace_root != "":
fail("Only files from the main workspace can be given to `data`, but got %s" % label)
file = str(repository_ctx.path(label))
relative_file = file.removeprefix(input_files_base + "/")
input_files_list.append(relative_file)
out_dir = str(repository_ctx.path(_WORKSPACE_REROOTED_PATH))

# Write files list
input_files_list_file = "data_files.txt"
repository_ctx.file(
input_files_list_file,
content = "\n".join(input_files_list),
)

# Run copy script
result = repository_ctx.execute(
[
repository_ctx.path(Label("//internal/npm_install:bulk_copy.sh")),
input_files_list_file,
input_files_base,
out_dir,
],
quiet = repository_ctx.attr.quiet,
)

if result.return_code != 0:
fail("bulk_copy.sh failed: \nSTDOUT:\n%s\nSTDERR:\n%s" % (result.stdout, result.stderr))

def _add_node_repositories_info_deps(repository_ctx):
# Add a dep to the node_info & yarn_info files from node_repositories
Expand Down Expand Up @@ -590,6 +614,7 @@ def _npm_install_impl(repository_ctx):
repository_ctx.path(Label("//internal/npm_install:index.js"))
repository_ctx.path(Label("@nodejs_%s//:node_info" % os_name(repository_ctx)))
repository_ctx.path(Label("@nodejs_%s//:yarn_info" % os_name(repository_ctx)))
repository_ctx.path(Label("//internal/npm_install:bulk_copy.sh"))

is_windows_host = is_windows_os(repository_ctx)

Expand Down Expand Up @@ -740,6 +765,7 @@ def _yarn_install_impl(repository_ctx):
repository_ctx.path(Label("//internal/npm_install:index.js"))
repository_ctx.path(Label("@nodejs_%s//:node_info" % os_name(repository_ctx)))
repository_ctx.path(Label("@nodejs_%s//:yarn_info" % os_name(repository_ctx)))
repository_ctx.path(Label("//internal/npm_install:bulk_copy.sh"))

is_windows_host = is_windows_os(repository_ctx)

Expand Down