github-ci: codecov llvm updates

Use LLVM 15 with Rust 1.67.1

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 19b323cb348b13f7a337212fb3e1910668a7cf3e..65cf630ce2e8495d6c47dee038a75141b9568307 100644 (file)
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -1288,8 +1288,8 @@ jobs:
                 build-essential \
                 autoconf \
                 automake \
-                llvm-14-dev \
-                clang-14 \
+                llvm-15-dev \
+                clang-15 \
                 git \
                 jq \
                 inetutils-ping \
@@ -1344,8 +1344,8 @@ jobs:
       - run: ./autogen.sh
       - run: ./configure --with-gnu-ld --disable-shared --enable-gccprotect --localstatedir=/var --prefix=/usr --sysconfdir=/etc
         env:
-          CC: "clang-14"
-          CXX: "clang++-14"
+          CC: "clang-15"
+          CXX: "clang++-15"
           RUSTFLAGS: "-C instrument-coverage"
           CFLAGS: "-fprofile-instr-generate -fcoverage-mapping -O0 -g -fno-strict-aliasing"
           CXXFLAGS: "-fprofile-instr-generate -fcoverage-mapping -O0 -g -fno-strict-aliasing"
@@ -1353,15 +1353,15 @@ jobs:
           ac_cv_func_realloc_0_nonnull: "yes"
       - run: make -j ${{ env.CPUS }}
         env:
-          CC: "clang-14"
-          CXX: "clang++-14"
+          CC: "clang-15"
+          CXX: "clang++-15"
           RUSTFLAGS: "-C instrument-coverage"
       - run: |
           ./qa/unix.sh "suricata-verify/"
         env:
           LLVM_PROFILE_FILE: "/tmp/unix.profraw"
-      - run: llvm-profdata-14 merge -o default.profdata $(find /tmp/ -name '*.profraw')
-      - run: llvm-cov-14 show ./src/suricata -instr-profile=default.profdata --show-instantiations --ignore-filename-regex="^/root/.*" > coverage.txt
+      - 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
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574
         with:
@@ -1392,8 +1392,8 @@ jobs:
                 build-essential \
                 autoconf \
                 automake \
-                llvm-14-dev \
-                clang-14 \
+                llvm-15-dev \
+                clang-15 \
                 git \
                 jq \
                 inetutils-ping \
@@ -1448,8 +1448,8 @@ jobs:
       - run: ./autogen.sh
       - run: ./configure --with-gnu-ld --enable-dpdk --disable-shared --enable-gccprotect --localstatedir=/var --prefix=/usr --sysconfdir=/etc
         env:
-          CC: "clang-14"
-          CXX: "clang++-14"
+          CC: "clang-15"
+          CXX: "clang++-15"
           RUSTFLAGS: "-C instrument-coverage"
           CFLAGS: "-fprofile-instr-generate -fcoverage-mapping -O0 -g -fno-strict-aliasing"
           CXXFLAGS: "-fprofile-instr-generate -fcoverage-mapping -O0 -g -fno-strict-aliasing"
@@ -1457,8 +1457,8 @@ jobs:
           ac_cv_func_realloc_0_nonnull: "yes"
       - run: make -j ${{ env.CPUS }}
         env:
-          CC: "clang-14"
-          CXX: "clang++-14"
+          CC: "clang-15"
+          CXX: "clang++-15"
           RUSTFLAGS: "-C instrument-coverage"
       # IDS config
       - run: |
@@ -1496,8 +1496,8 @@ jobs:
           ./.github/workflows/live/pcap.sh "single"
         env:
           LLVM_PROFILE_FILE: "/tmp/pcap-single.profraw"
-      - run: llvm-profdata-14 merge -o default.profdata $(find /tmp/ -name '*.profraw')
-      - run: llvm-cov-14 show ./src/suricata -instr-profile=default.profdata --show-instantiations --ignore-filename-regex="^/root/.*" > coverage.txt
+      - 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
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574
         with:
@@ -1716,8 +1716,8 @@ jobs:
                 build-essential \
                 autoconf \
                 automake \
-                llvm-14-dev \
-                clang-14 \
+                llvm-15-dev \
+                clang-15 \
                 git \
                 jq \
                 libc++-dev \
@@ -1772,8 +1772,8 @@ jobs:
       - run: ./configure --enable-warnings --with-gnu-ld --enable-fuzztargets --disable-shared --enable-gccprotect
         env:
           LIB_FUZZING_ENGINE: "fail_to_onefile_driver"
-          CC: "clang-14"
-          CXX: "clang++-14"
+          CC: "clang-15"
+          CXX: "clang++-15"
           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"
@@ -1781,12 +1781,12 @@ jobs:
           ac_cv_func_realloc_0_nonnull: "yes"
       - run: make -j ${{ env.CPUS }}
         env:
-          CC: "clang-14"
-          CXX: "clang++-14"
+          CC: "clang-15"
+          CXX: "clang++-15"
           RUSTFLAGS: "-C instrument-coverage"
       - run: ./qa/run-ossfuzz-corpus.sh
-      - run: llvm-profdata-14 merge -o default.profdata $(find /tmp/ -name '*.profraw')
-      - run: llvm-cov-14 show ./src/suricata -instr-profile=default.profdata --show-instantiations --ignore-filename-regex="^/root/.*" > coverage.txt
+      - 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
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574
         with: