digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Bump rules_nodejs to 3.5.1 (#9796)

Browse Source 
Just cleaning up the mess I produced with the 3.5.0 upgrade (or more
like moving the mess into rules_nodejs).

changelog_begin
changelog_end
This commit is contained in:
Moritz Kiefer 2021-05-26 10:35:18 +02:00 committed by GitHub
parent 4e9c86ccd0
commit 77e6fd6aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
bazel_tools/rules_nodejs_windows_mkdir.patch
View File

@ -1,31 +0,0 @@
diff --git a/internal/npm_install/npm_install.bzl b/internal/npm_install/npm_install.bzl
index 3c07b3a0..a7b77d9a 100644
--- a/internal/npm_install/npm_install.bzl
+++ b/internal/npm_install/npm_install.bzl
@@ -335,8 +335,9 @@ def _copy_file(repository_ctx, f):
to_segments = to.split("/")
if len(to_segments) > 1:
dirname = "/".join(to_segments[:-1])
+ args = ["mkdir", "-p", dirname] if not is_windows_os(repository_ctx) else ["cmd", "/c", "if not exist {dir} mkdir {dir}".format(dir = dirname)]
result = repository_ctx.execute(
- ["mkdir", "-p", dirname],
+ args,
quiet = repository_ctx.attr.quiet,
)
if result.return_code:
@@ -344,12 +345,13 @@ def _copy_file(repository_ctx, f):
# copy the file; don't use the repository_ctx.template trick with empty substitution as this
# does not copy over binary files properly
+ cp_args = ["cp", "-f", repository_ctx.path(f), to] if not is_windows_os(repository_ctx) else ["cmd", "/c", "copy /y {} {}".format("\\".join(str(repository_ctx.path(f)).split("/")), "\\".join(to_segments))]
result = repository_ctx.execute(
- ["cp", "-f", repository_ctx.path(f), to],
+ cp_args,
quiet = repository_ctx.attr.quiet,
)
if result.return_code:
- fail("cp -f %s %s failed: \nSTDOUT:\n%s\nSTDERR:\n%s" % (repository_ctx.path(f), to, result.stdout, result.stderr))
+ fail("cp -f {} {} failed: \nSTDOUT:\n{}\nSTDERR:\n{}, {}".format(repository_ctx.path(f), to, result.stdout, result.stderr, cp_args))
def _symlink_file(repository_ctx, f):
repository_ctx.symlink(f, _workspace_root_path(repository_ctx, f))

6
deps.bzl
View File

@ -41,8 +41,8 @@ buildifier_version = "4.0.0"
buildifier_sha256 = "0d3ca4ed434958dda241fb129f77bd5ef0ce246250feed2d5a5470c6f29a77fa"
zlib_version = "1.2.11"
zlib_sha256 = "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff"
rules_nodejs_version = "3.5.0"
rules_nodejs_sha256 = "10f534e1c80f795cffe1f2822becd4897754d18564612510c59b3c73544ae7c6"
rules_nodejs_version = "3.5.1"
rules_nodejs_sha256 = "4a5d654a4ccd4a4c24eca5d319d85a88a650edf119601550c95bf400c8cc897e"
rules_jvm_external_version = "3.3"
rules_jvm_external_sha256 = "d85951a92c0908c80bd8551002d66cb23c3434409c814179c0ff026b53544dab"
rules_go_version = "0.23.6"
@ -204,8 +204,6 @@ def daml_deps():
# Work around for https://github.com/bazelbuild/rules_nodejs/issues/1565
"@com_github_digital_asset_daml//bazel_tools:rules_nodejs_npm_cli_path.patch",
"@com_github_digital_asset_daml//bazel_tools:rules_nodejs_node_dependency.patch",
# Can be upstreamed
"@com_github_digital_asset_daml//bazel_tools:rules_nodejs_windows_mkdir.patch",
],
patch_args = ["-p1"],
)