diff --git a/.cirrus.yml b/.cirrus.yml index 69ad1e2c88..8f81344ff8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -387,21 +387,21 @@ ubsan_sanitizer_task: ZEEK_TAILORED_UB_CHECKS: 1 UBSAN_OPTIONS: print_stacktrace=1 -tsan_sanitizer_task: - container: - # Just uses a recent/common distro to run memory error/leak checks. - dockerfile: ci/ubuntu-22.04/Dockerfile - << : *SANITIZERS_RESOURCE_TEMPLATE +# tsan_sanitizer_task: +# container: +# # Just uses a recent/common distro to run memory error/leak checks. +# dockerfile: ci/ubuntu-22.04/Dockerfile +# << : *SANITIZERS_RESOURCE_TEMPLATE - << : *CI_TEMPLATE - << : *SKIP_TASK_ON_PR - env: - ZEEK_CI_CONFIGURE_FLAGS: *TSAN_SANITIZER_CONFIG - ZEEK_CI_DISABLE_SCRIPT_PROFILING: 1 - # 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 - # the correct name in the testing scripts. - ZEEK_TSAN_OPTIONS: suppressions=/zeek/ci/tsan_suppressions.txt +# << : *CI_TEMPLATE +# << : *SKIP_TASK_ON_PR +# env: +# ZEEK_CI_CONFIGURE_FLAGS: *TSAN_SANITIZER_CONFIG +# ZEEK_CI_DISABLE_SCRIPT_PROFILING: 1 +# # 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 +# # the correct name in the testing scripts. +# ZEEK_TSAN_OPTIONS: suppressions=/zeek/ci/tsan_suppressions.txt windows_task: # 2 hour timeout just for potential of building Docker image taking a while diff --git a/CHANGES b/CHANGES index c443b74291..5fd6886872 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Bump Spicy (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index e592692346..fafb36559e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.1.0-dev.436 +6.1.0-dev.441