diff --git a/.cirrus.yml b/.cirrus.yml index 54458bfd38..e159dbb0ac 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -397,6 +397,8 @@ asan_sanitizer_task: CXXFLAGS: -DZEEK_DICT_DEBUG ZEEK_CI_CONFIGURE_FLAGS: *ASAN_SANITIZER_CONFIG ASAN_OPTIONS: detect_leaks=1:detect_odr_violation=0 + # Use absolute paths for coverage files. + CCACHE_BASEDIR: ubsan_sanitizer_task: container: diff --git a/CHANGES b/CHANGES index 65c0231d85..50587f0997 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +7.0.0-dev.376 | 2024-06-11 11:00:46 +0200 + + * Bump cmake for -fprofile-update=atomic usage (Arne Welzel, Corelight) + + * cirrus: Unset CCACHE_BASEDIR for asan/coverage build (Arne Welzel, Corelight) + + When CCACHE_BASEDIR is set, ccache will rewrite absolute paths to + relative paths in order to allow compilation in different source + directories. We do not need this feature on Cirrus (the checkout + is always in /zeek) and using absolute paths avoids + confusion/normalization needs for the gcov -p results. + + We could consider removing the global CCACHE_BASEDIR, but it'd + bust the ccache of every other task, too. + 7.0.0-dev.372 | 2024-06-07 09:28:52 -0700 * Add Telemetry::metrics_address option (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index b6f01341b8..0296911e20 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.372 +7.0.0-dev.376 diff --git a/cmake b/cmake index aeca56db02..2df3b8e82a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit aeca56db02ef5056ea880ec7fa94463841b4b535 +Subproject commit 2df3b8e82a843b7b8187963d259d32a9fb42b873