diff --git a/.cirrus.yml b/.cirrus.yml index a4717ff417..1f5c94b283 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -380,21 +380,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 1c02db19e0..d1bd84adcf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +6.0.1-13 | 2023-10-16 13:32:12 -0700 + + * CI: Disable tsan task until it can be fixed (Tim Wojtulewicz, Corelight) + + (cherry picked from commit 5ff24dad234f90dcae0d89a2b8bcc6b19f41f4b5) + + * Update zeekjs submodule to v0.9.6 [nomail] (Tim Wojtulewicz, Corelight) + 6.0.1-11 | 2023-10-16 13:27:18 -0700 * Do not require cookie for `reject_protocol` during teardown. (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index 5efecd25fc..f3927696bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.1-11 +6.0.1-13