Merge remote-tracking branch 'origin/topic/timw/fix-coverage-part-trois'

* origin/topic/timw/fix-coverage-part-trois:
  CI: Revert part of 2bde82ffa2 to fix coverage builds
This commit is contained in:
Tim Wojtulewicz 2024-05-28 13:05:45 -07:00
commit d86e73376b
3 changed files with 6 additions and 10 deletions

View file

@ -1,3 +1,7 @@
7.0.0-dev.287 | 2024-05-28 13:05:45 -0700
* CI: Revert part of 2bde82ffa2f5fe9161e3322fee82eb45699b9164 to fix coverage builds (Tim Wojtulewicz, Corelight)
7.0.0-dev.284 | 2024-05-24 15:04:27 -0700 7.0.0-dev.284 | 2024-05-24 15:04:27 -0700
* Fix Zeekygen warning for QUIC::unrecognized_version event (Christian Kreibich, Corelight) * Fix Zeekygen warning for QUIC::unrecognized_version event (Christian Kreibich, Corelight)

View file

@ -1 +1 @@
7.0.0-dev.284 7.0.0-dev.287

View file

@ -21,15 +21,7 @@ BASE="$(cd "$CURR" && cd ../../ && pwd)"
TMP="${CURR}/tmp.$$" TMP="${CURR}/tmp.$$"
mkdir -p $TMP mkdir -p $TMP
GCOV_CMD="" GCOV_CMD=$(which gcov)
if [ -n "${CIRRUS_TASK_NAME}" ]; then
GCOV_CMD="$(which llvm-cov-18)"
if [ -n "${GCOV_CMD}" ]; then
GCOV_CMD="${GCOV_CMD} gcov"
fi
else
GCOV_CMD="$(which gcov)"
fi
if [ -z "${GCOV_CMD}" ]; then if [ -z "${GCOV_CMD}" ]; then
echo "gcov is not installed on system, aborting" echo "gcov is not installed on system, aborting"