Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci/collect-repo-info.py: Recognize git worktrees, too

Browse source 
Benjamin reported ci/collect-repo-info.py failing for him in
Git worktrees, use `git` to actually check if we're in a repo.
This commit is contained in:
Arne Welzel 2023-02-14 09:34:03 +01:00
parent 252cd33283
commit b9218b2ec7
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ci/collect-repo-info.py
View file

@ -21,8 +21,16 @@ GIT = "git"
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def git(*args): def git(*args, **kwargs):
return subprocess.check_output([GIT, *args]).decode("utf-8") return subprocess.check_output([GIT, *args], **kwargs).decode("utf-8")
def git_is_repo(d: pathlib.Path):
try:
git("-C", str(d), "rev-parse", "--is-inside-work-tree", stderr=subprocess.DEVNULL)
return True
except subprocess.CalledProcessError:
return False
def git_is_dirty(d: pathlib.Path): def git_is_dirty(d: pathlib.Path):
@ -111,7 +119,7 @@ def collect_plugin_info(plugin_dir: pathlib.Path):
except FileNotFoundError: except FileNotFoundError:
logger.warning("No VERSION found in %s", plugin_dir) logger.warning("No VERSION found in %s", plugin_dir)
if (plugin_dir / ".git").exists(): if git_is_repo(plugin_dir):
result.update(git_generic_info(plugin_dir)) result.update(git_generic_info(plugin_dir))
return result return result
@ -151,7 +159,7 @@ def main():
# Attempt to collect info from git first and alternatively # Attempt to collect info from git first and alternatively
# fall back to a repo-info.json file within what is assumed # fall back to a repo-info.json file within what is assumed
# to be a tarball. # to be a tarball.
if (zeek_dir / ".git").is_dir(): if git_is_repo(zeek_dir):
info = collect_git_info(zeek_dir) info = collect_git_info(zeek_dir)
elif not args.only_git: elif not args.only_git:
try: try: