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

Merge remote-tracking branch 'origin/topic/johanna/static-ci'

Browse source 
* origin/topic/johanna/static-ci:
  Fix cirrus config for static broker test.
  Add a test for compiling with static broker/binpac
This commit is contained in:
Jon Siwek 2020-12-03 18:02:22 -08:00
commit 4228fbca0b
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.cirrus.yml
View file

@ -3,7 +3,8 @@ btest_jobs: &BTEST_JOBS 4
btest_retries: &BTEST_RETRIES 2 btest_retries: &BTEST_RETRIES 2
memory: &MEMORY 4GB memory: &MEMORY 4GB
config: &CONFIG --build-type=release --enable-cpp-tests --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install config: &CONFIG --build-type=release --enable-cpp-tests --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install
static_config: &STATIC_CONFIG --build-type=release --enable-cpp-tests --disable-broker-tests --enable-static-broker --enable-static-binpac --prefix=$CIRRUS_WORKING_DIR/install
sanitizer_config: &SANITIZER_CONFIG --build-type=debug --enable-cpp-tests --disable-broker-tests --sanitizers=address,undefined --enable-fuzzers --enable-coverage sanitizer_config: &SANITIZER_CONFIG --build-type=debug --enable-cpp-tests --disable-broker-tests --sanitizers=address,undefined --enable-fuzzers --enable-coverage
resources_template: &RESOURCES_TEMPLATE resources_template: &RESOURCES_TEMPLATE
@ -113,6 +114,16 @@ debian10_task:
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
debian10_static_task:
container:
# Just uses a recent/common distro to run a static compile test.
# Debian 10 EOL: June 2024
dockerfile: ci/debian-10/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
env:
ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
debian9_task: debian9_task:
container: container:
# Debian 9 EOL: June 2022 # Debian 9 EOL: June 2022

5
CHANGES
View file

@ -1,3 +1,8 @@
3.3.0-dev.600 | 2020-12-03 18:02:22 -0800
* Add a CI task for compiling with static broker/binpac (Johanna Amann, Corelight)
3.3.0-dev.596 | 2020-12-03 09:35:42 -0700 3.3.0-dev.596 | 2020-12-03 09:35:42 -0700
* Fix a couple of life-time issues when plugin loading fails. * Fix a couple of life-time issues when plugin loading fails.

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.596 3.3.0-dev.600