From cc15948239c9bc58e6d65cea1cabb7368abb9484 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Fri, 12 May 2023 12:38:36 +0200 Subject: [PATCH] Add `zkg_provides` to `--build-info`. This makes dependencies explicit that Zeek provides built-in for `zkg`. It's in support of https://github.com/zeek/package-manager/pull/157. For now, `zkg_provides` contains the same data as `included_plugins` plus an entry for `spicy-plugin`. --- ci/collect-repo-info.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/collect-repo-info.py b/ci/collect-repo-info.py index 8aa6a49cf5..0fc6b6b8e2 100755 --- a/ci/collect-repo-info.py +++ b/ci/collect-repo-info.py @@ -9,6 +9,7 @@ Example usage: """ import argparse +import copy import json import logging import pathlib @@ -207,6 +208,11 @@ def main(): info["included_plugins"] = included_plugins_info + zkg_provides_info = copy.deepcopy(included_plugins_info) + # Hardcode the former spicy-plugin so that zkg knows Spicy is available. + zkg_provides_info.append({"name": "spicy-plugin", "version": info["version"].split("-")[0]}) + info["zkg_provides"] = zkg_provides_info + json_str = json.dumps(info, indent=2, sort_keys=True) print(json_str)