Skip to content

Commit 104b7b9

Browse files
[Build] Update rules_pkg to 0.8. Also add tree inclusion patch
1 parent dd080a1 commit 104b7b9

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

WORKSPACE

+9-2
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,17 @@ rules_closure_toolchains()
231231

232232
http_archive(
233233
name = "rules_pkg",
234-
sha256 = "451e08a4d78988c06fa3f9306ec813b836b1d076d0f055595444ba4ff22b867f",
234+
patch_args = [
235+
"-p1",
236+
],
237+
patches = [
238+
"//py:rules_pkg_tree.patch",
239+
],
235240
urls = [
236-
"https://github.com/bazelbuild/rules_pkg/releases/download/0.7.1/rules_pkg-0.7.1.tar.gz",
241+
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.8.0/rules_pkg-0.8.0.tar.gz",
242+
"https://github.com/bazelbuild/rules_pkg/releases/download/0.8.0/rules_pkg-0.8.0.tar.gz",
237243
],
244+
sha256 = "eea0f59c28a9241156a47d7a8e32db9122f3d50b505fae0f33de6ce4d9b61834",
238245
)
239246

240247
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")

py/rules_pkg_tree.patch

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/pkg/private/tar/build_tar.py b/pkg/private/tar/build_tar.py
2+
index ab16610d..b6b75bd7 100644
3+
--- a/pkg/private/tar/build_tar.py
4+
+++ b/pkg/private/tar/build_tar.py
5+
@@ -309,7 +309,10 @@ def add_manifest_entry(self, entry_list, file_attributes):
6+
elif entry.entry_type == manifest.ENTRY_IS_EMPTY_FILE:
7+
self.add_empty_file(entry.dest, **attrs)
8+
else:
9+
- self.add_file(entry.src, entry.dest, **attrs)
10+
+ if os.path.isdir(entry.src):
11+
+ self.add_tree(entry.src, entry.dest, **attrs)
12+
+ else:
13+
+ self.add_file(entry.src, entry.dest, **attrs)
14+
15+
16+
def main():

0 commit comments

Comments
 (0)