Merge pull request #36830 from AnotherGroupChat:hermetic-build-fix
PiperOrigin-RevId: 297125647 Change-Id: Ifda9d063b080ccd52e2c493db7928f7320ccf8f7
This commit is contained in:
commit
cf608db45c
@ -13,5 +13,4 @@ py_binary(
|
|||||||
srcs = ["gen_git_source.py"],
|
srcs = ["gen_git_source.py"],
|
||||||
python_version = "PY3",
|
python_version = "PY3",
|
||||||
srcs_version = "PY2AND3",
|
srcs_version = "PY2AND3",
|
||||||
deps = ["@six_archive//:six"],
|
|
||||||
)
|
)
|
||||||
|
@ -35,8 +35,6 @@ import os
|
|||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
import six
|
|
||||||
|
|
||||||
|
|
||||||
def parse_branch_ref(filename):
|
def parse_branch_ref(filename):
|
||||||
"""Given a filename of a .git/HEAD file return ref path.
|
"""Given a filename of a .git/HEAD file return ref path.
|
||||||
@ -169,8 +167,8 @@ def get_git_version(git_base_path, git_tag_override):
|
|||||||
subprocess.check_output([
|
subprocess.check_output([
|
||||||
"git",
|
"git",
|
||||||
str("--git-dir=%s/.git" % git_base_path),
|
str("--git-dir=%s/.git" % git_base_path),
|
||||||
str("--work-tree=" + six.ensure_str(git_base_path)), "describe",
|
str("--work-tree=%s" % git_base_path), "describe", "--long",
|
||||||
"--long", "--tags"
|
"--tags"
|
||||||
]).strip())
|
]).strip())
|
||||||
version_separator = b"-"
|
version_separator = b"-"
|
||||||
if git_tag_override and val:
|
if git_tag_override and val:
|
||||||
|
@ -161,7 +161,6 @@ genrule(
|
|||||||
"@nasm//:LICENSE",
|
"@nasm//:LICENSE",
|
||||||
"@nsync//:LICENSE",
|
"@nsync//:LICENSE",
|
||||||
"@png//:LICENSE",
|
"@png//:LICENSE",
|
||||||
"@six_archive//:LICENSE",
|
|
||||||
"@snappy//:COPYING",
|
"@snappy//:COPYING",
|
||||||
"@sobol_data//:LICENSE",
|
"@sobol_data//:LICENSE",
|
||||||
"@zlib//:zlib.h",
|
"@zlib//:zlib.h",
|
||||||
@ -244,7 +243,6 @@ genrule(
|
|||||||
"@nasm//:LICENSE",
|
"@nasm//:LICENSE",
|
||||||
"@nsync//:LICENSE",
|
"@nsync//:LICENSE",
|
||||||
"@png//:LICENSE",
|
"@png//:LICENSE",
|
||||||
"@six_archive//:LICENSE",
|
|
||||||
"@snappy//:COPYING",
|
"@snappy//:COPYING",
|
||||||
"@sobol_data//:LICENSE",
|
"@sobol_data//:LICENSE",
|
||||||
"@zlib//:zlib.h",
|
"@zlib//:zlib.h",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user