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/timw/disable-tsan-ci-task'

Browse source 
* origin/topic/timw/disable-tsan-ci-task:
  CI: Disable tsan task until it can be fixed
This commit is contained in:
Tim Wojtulewicz 2023-09-22 14:38:26 -07:00
commit 5ff24dad23
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
.cirrus.yml
View file

@ -387,21 +387,21 @@ ubsan_sanitizer_task:
ZEEK_TAILORED_UB_CHECKS: 1 ZEEK_TAILORED_UB_CHECKS: 1
UBSAN_OPTIONS: print_stacktrace=1 UBSAN_OPTIONS: print_stacktrace=1
tsan_sanitizer_task: # tsan_sanitizer_task:
container: # container:
# Just uses a recent/common distro to run memory error/leak checks. # # Just uses a recent/common distro to run memory error/leak checks.
dockerfile: ci/ubuntu-22.04/Dockerfile # dockerfile: ci/ubuntu-22.04/Dockerfile
<< : *SANITIZERS_RESOURCE_TEMPLATE # << : *SANITIZERS_RESOURCE_TEMPLATE
<< : *CI_TEMPLATE # << : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR # << : *SKIP_TASK_ON_PR
env: # env:
ZEEK_CI_CONFIGURE_FLAGS: *TSAN_SANITIZER_CONFIG # ZEEK_CI_CONFIGURE_FLAGS: *TSAN_SANITIZER_CONFIG
ZEEK_CI_DISABLE_SCRIPT_PROFILING: 1 # ZEEK_CI_DISABLE_SCRIPT_PROFILING: 1
# If this is defined directly in the environment, configure fails to find # # If this is defined directly in the environment, configure fails to find
# OpenSSL. Instead we define it with a different name and then give it # # OpenSSL. Instead we define it with a different name and then give it
# the correct name in the testing scripts. # # the correct name in the testing scripts.
ZEEK_TSAN_OPTIONS: suppressions=/zeek/ci/tsan_suppressions.txt # ZEEK_TSAN_OPTIONS: suppressions=/zeek/ci/tsan_suppressions.txt
windows_task: windows_task:
# 2 hour timeout just for potential of building Docker image taking a while # 2 hour timeout just for potential of building Docker image taking a while

6
CHANGES
View file

@ -1,3 +1,9 @@
6.1.0-dev.441 | 2023-09-22 14:38:26 -0700
* CI: Disable tsan task until it can be fixed (Tim Wojtulewicz, Corelight)
* Update af_packet plugin submodule [nomail] (Tim Wojtulewicz)
6.1.0-dev.436 | 2023-09-22 15:06:39 +0200 6.1.0-dev.436 | 2023-09-22 15:06:39 +0200
* Bump Spicy (Benjamin Bannier, Corelight) * Bump Spicy (Benjamin Bannier, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.1.0-dev.436 6.1.0-dev.441