fixup! ci: update ubuntu22.04 builds with clang14+asan

OISF · Mar 14, 2024 · 09d76f5 · 09d76f5
1 parent afae3ea
commit 09d76f5
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -1490,8 +1490,8 @@ jobs:
                 build-essential \
                 autoconf \
                 automake \
-                llvm-15-dev \
-                clang-15 \
+                llvm-17-dev \
+                clang-17 \
                 git \
                 jq \
                 libc++-dev \
@@ -1550,21 +1550,21 @@ jobs:
       - run: ./configure --with-gnu-ld --enable-fuzztargets --disable-shared --enable-gccprotect
         env:
           LIB_FUZZING_ENGINE: "fail_to_onefile_driver"
-          CC: "clang-15"
-          CXX: "clang++-15"
+          CC: "clang-17"
+          CXX: "clang++-17"
           RUSTFLAGS: "-C instrument-coverage"
           CFLAGS: "-fprofile-instr-generate -fcoverage-mapping -O0 -g -fno-strict-aliasing -fsanitize=address -fno-omit-frame-pointer -fPIC -Wno-unused-parameter -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1 -Wimplicit-int-float-conversion -Wimplicit-int-conversion -Werror"
           CXXFLAGS: "-fprofile-instr-generate -fcoverage-mapping -O0 -g -fno-strict-aliasing -fsanitize=address -fno-omit-frame-pointer -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1 -stdlib=libc++ -Wimplicit-int-float-conversion -Wimplicit-int-conversion"
           ac_cv_func_malloc_0_nonnull: "yes"
           ac_cv_func_realloc_0_nonnull: "yes"
       - run: make -j ${{ env.CPUS }}
         env:
-          CC: "clang-15"
-          CXX: "clang++-15"
+          CC: "clang-17"
+          CXX: "clang++-17"
           RUSTFLAGS: "-C instrument-coverage"
       - run: ./qa/run-ossfuzz-corpus.sh
-      - run: llvm-profdata-15 merge -o default.profdata $(find /tmp/ -name '*.profraw')
-      - run: llvm-cov-15 show ./src/suricata -instr-profile=default.profdata --show-instantiations --ignore-filename-regex="^/root/.*" > coverage.txt
+      - run: llvm-profdata-17 merge -o default.profdata $(find /tmp/ -name '*.profraw')
+      - run: llvm-cov-17 show ./src/suricata -instr-profile=default.profdata --show-instantiations --ignore-filename-regex="^/root/.*" > coverage.txt
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
         with:
@@ -1776,6 +1776,7 @@ jobs:
                 python3-yaml \
                 rustc \
                 software-properties-common \
+                sudo \
                 zlib1g \
                 zlib1g-dev \
                 exuberant-ctags