diff --git a/.cirrus.yml b/.cirrus.yml index 7fa3c8034..a7e4cd51b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -890,10 +890,10 @@ zeek_plugin_task: - zeek -NN _Zeek::Spicy | grep -q ANALYZER_SPICY_TFTP test_plugin_script: - - (PATH=/opt/spicy-plugin/bin:$PATH make -C spicy-plugin/tests test-install) + - (PATH=/opt/spicy/bin:/opt/spicy-plugin/bin:$PATH make -C spicy-plugin/tests test-install) test_analyzer_script: - - (PATH=/opt/spicy-plugin/bin:$PATH make -C spicy-analyzers/tests test-install) + - (PATH=/opt/spicy/bin:/opt/spicy-plugin/bin:$PATH make -C spicy-analyzers/tests test-install) check_script: - (cd /tmp && zeek -r ${CIRRUS_WORKING_DIR}/spicy-analyzers/tests/Traces/tftp_rrq.pcap spicy-analyzers && test -e tftp.log && grep rfc1350.txt tftp.log) diff --git a/CHANGES b/CHANGES index a033810a5..31bf0ef6f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +1.4.0-dev.38 | 2021-11-04 12:35:22 +0100 + + * Make Spicy prefix visible for CI jobs testing spicy-[plugin|analyzers]. (Benjamin Bannier, Corelight) + 1.4.0-dev.36 | 2021-11-02 13:07:00 +0100 * Show diff if pre-commit fails in CI. (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index c906894c8..b0e04ad48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0-dev.36 +1.4.0-dev.38