From 4fedba11404ea6548fd2ed319adf4b78a56180b4 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Fri, 26 Apr 2024 10:13:11 -0600 Subject: [PATCH] github-ci: remove cocci from fedora 39 build Cocci on Fedora 39+ gets stuck for some reason. Cocci has been moved to a new Ubuntu 24.04 build. --- .github/workflows/builds.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 408f64dd8f..d17b4fa7e3 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -802,7 +802,7 @@ jobs: # Fedora 39 build using Clang. fedora-39-clang: - name: Fedora 39 (clang, cocci, debug, asan, wshadow, rust-strict, systemd) + name: Fedora 39 (clang, debug, asan, wshadow, rust-strict, systemd) runs-on: ubuntu-latest container: fedora:39 needs: [prepare-deps] @@ -833,7 +833,6 @@ jobs: cbindgen \ ccache \ clang \ - coccinelle \ diffutils \ file-devel \ gcc \ @@ -875,10 +874,8 @@ jobs: - run: tar xf prep/libhtp.tar.gz - run: tar xf prep/suricata-update.tar.gz - run: ./autogen.sh - - run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow" ./configure --disable-shared --enable-coccinelle - - name: Running unit tests and cocci checks - # Set the concurrency level for cocci. - run: CONCURRENCY_LEVEL=${{ env.CPUS }} make check + - run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow" ./configure --disable-shared + - run: make check - run: make distclean - run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow -fsanitize=address -fno-omit-frame-pointer" ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis --enable-nfqueue --enable-lua env: -- 2.47.2