From: Victor Julien <vjulien@oisf.net>
Date: Mon, 10 Jul 2023 12:50:44 +0000 (+0200)
Subject: github-ci: run cocci in fedora 38
X-Git-Tag: suricata-7.0.0~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f822ba0533a5cf9c9eb99a2531cb6ad288d9218;p=thirdparty%2Fsuricata.git

github-ci: run cocci in fedora 38
---

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 7f8f8b5930..d08def82cd 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -890,6 +890,7 @@ jobs:
                 cbindgen \
                 ccache \
                 clang \
+                coccinelle \
                 diffutils \
                 file-devel \
                 gcc \
@@ -917,6 +918,7 @@ jobs:
                 nss-softokn-devel \
                 pcre2-devel \
                 pkgconfig \
+                python \
                 python3-yaml \
                 sudo \
                 systemd-devel \
@@ -930,6 +932,11 @@ 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=2 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:
           LDFLAGS: "-fsanitize=address"
@@ -1833,100 +1840,6 @@ jobs:
       - name: Running suricata-verify
         run: python3 ./suricata-verify/run.py -q
 
-  ubuntu-22-04:
-    name: Ubuntu 22.04 (Cocci)
-    runs-on: ubuntu-22.04
-    container: ubuntu:22.04
-    needs: [prepare-deps, prepare-cbindgen]
-    steps:
-
-      # Cache Rust stuff.
-      - name: Cache cargo registry
-        uses: actions/cache@v3.3.1
-        with:
-          path: ~/.cargo
-          key: ${{ github.job }}-cargo
-
-      - name: Install dependencies
-        run: |
-          apt update
-          apt -y install \
-                libpcre2-dev \
-                build-essential \
-                autoconf \
-                automake \
-                cargo \
-                git \
-                jq \
-                libtool \
-                libpcap-dev \
-                libnet1-dev \
-                libyaml-0-2 \
-                libyaml-dev \
-                libcap-ng-dev \
-                libcap-ng0 \
-                libmagic-dev \
-                libnetfilter-queue-dev \
-                libnetfilter-queue1 \
-                libnfnetlink-dev \
-                libnfnetlink0 \
-                libhiredis-dev \
-                libjansson-dev \
-                libevent-dev \
-                libevent-pthreads-2.1-7 \
-                libjansson-dev \
-                libpython2.7 \
-                libpython3.10 \
-                make \
-                parallel \
-                python3-yaml \
-                python-is-python3 \
-                rustc \
-                software-properties-common \
-                zlib1g \
-                zlib1g-dev \
-                exuberant-ctags
-      - name: Install packages for generating documentation
-        run: |
-          DEBIAN_FRONTEND=noninteractive apt -y install \
-                sphinx-doc \
-                sphinx-common \
-                texlive-latex-base \
-                texlive-fonts-recommended \
-                texlive-fonts-extra \
-                texlive-latex-extra
-      - name: Install Coccinelle
-        run: |
-          apt -y install coccinelle
-      - uses: actions/checkout@v3.5.3
-      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
-        with:
-          name: prep
-          path: prep
-      - run: tar xf prep/libhtp.tar.gz
-      - name: Setup cbindgen
-        run: |
-          mkdir -p $HOME/.cargo/bin
-          cp prep/cbindgen $HOME/.cargo/bin
-          chmod 755 $HOME/.cargo/bin/cbindgen
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - run: ./autogen.sh
-      - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --enable-coccinelle
-      - run: make -j2
-      - run: make tags
-      - name: Running unit tests and cocci checks
-        # Set the concurrency level for cocci.
-        run: CONCURRENCY_LEVEL=2 make check
-      - run: make dist
-      - name: Checking that documentation was built
-        run: |
-          test -e doc/userguide/userguide.pdf
-          test -e doc/userguide/suricata.1
-      - name: Extracting suricata-verify
-        run: tar xf prep/suricata-verify.tar.gz
-      - name: Running suricata-verify
-        run: python3 ./suricata-verify/run.py -q
-
   # test build with afl and fuzztargets
   ubuntu-22-04-fuzz:
     name: Ubuntu 22.04 (Fuzz)