Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 22:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/awelzel/collect-repo-info-softer-git-dependency-take-2'

Browse source 
* origin/topic/awelzel/collect-repo-info-softer-git-dependency-take-2:
  ci/collect-repo-info: No hard dependency on git, take two
This commit is contained in:
Arne Welzel 2023-02-23 15:18:50 +01:00
commit 74bcfdda2e
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,3 +1,10 @@
6.0.0-dev.104 | 2023-02-23 15:18:50 +0100
* ci/collect-repo-info: No hard dependency on git, take two (Arne Welzel, Corelight)
Collecting information about builtin external plugins also
tried to use `git` unconditionally.
6.0.0-dev.100 | 2023-02-22 17:05:56 -0700
* Use btest -A on CI to get more information about stuck tests (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.100
6.0.0-dev.104

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

@ -129,7 +129,7 @@ def collect_plugin_info(plugin_dir: pathlib.Path):
except FileNotFoundError:
logger.warning("No VERSION found in %s", plugin_dir)
if git_is_repo(plugin_dir):
if git_available() and git_is_repo(plugin_dir):
result.update(git_generic_info(plugin_dir))
return result