github-ci: add bindgen where needed

OISF · Nov 21, 2024 · 587acd0 · 587acd0
1 parent a7de5f9
commit 587acd0
Showing 1 changed file with 51 additions and 4 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -93,8 +93,10 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen-cli \
                 cargo-vendor \
                 cbindgen \
+                clang-devel \
                 diffutils \
                 numactl-devel \
                 dpdk-devel \
@@ -250,7 +252,9 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cbindgen \
+                clang-devel \
                 diffutils \
                 numactl-devel \
                 dpdk-devel \
@@ -344,6 +348,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo-vendor \
                 cbindgen \
                 diffutils \
@@ -491,12 +496,14 @@ jobs:
 
       - name: Install system packages
         run: |
-          yum -y install dnf-plugins-core
+          yum -y install dnf-plugins-core epel-release
           yum config-manager --set-enabled powertools
           yum -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo-vendor \
+                clang-devel \
                 diffutils \
                 numactl-devel \
                 dpdk-devel \
@@ -593,7 +600,9 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo-vendor \
+                clang-devel \
                 diffutils \
                 numactl-devel \
                 dpdk-devel \
@@ -684,6 +693,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cbindgen \
                 ccache \
                 clang \
@@ -781,6 +791,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -880,9 +891,11 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
+                clang-devel \
                 diffutils \
                 file-devel \
                 gcc \
@@ -977,6 +990,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -1071,9 +1085,11 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
+                clang-devel \
                 diffutils \
                 file-devel \
                 gcc \
@@ -1155,6 +1171,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -1253,6 +1270,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 clang \
@@ -1375,6 +1393,7 @@ jobs:
           apt -y install \
                 autoconf \
                 automake \
+                bindgen \
                 build-essential \
                 cargo \
                 cbindgen \
@@ -1448,6 +1467,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -1573,6 +1593,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -1678,6 +1699,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -1815,6 +1837,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -1902,6 +1925,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -2005,6 +2029,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -2105,6 +2130,7 @@ jobs:
         run: |
           apt update
           apt -y install \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -2257,6 +2283,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -2341,6 +2368,7 @@ jobs:
                 afl \
                 afl-clang \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -2406,6 +2434,7 @@ jobs:
             sudo apt update
             sudo apt -y install \
                   libpcre2-dev \
+                  bindgen \
                   build-essential \
                   autoconf \
                   automake \
@@ -2545,13 +2574,15 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
                 cargo \
                 git \
                 jq \
                 libtool \
+                libclang-dev \
                 libpcap-dev \
                 libnet1-dev \
                 libyaml-0-2 \
@@ -2643,13 +2674,15 @@ jobs:
           apt -y install \
               autoconf \
               automake \
+              bindgen \
               build-essential \
               cmake \
               curl \
               dpdk-dev \
               git \
               jq \
               make \
+              libclang-dev \
               libpcre3 \
               libpcre3-dbg \
               libpcre3-dev \
@@ -2746,13 +2779,15 @@ jobs:
           apt -y install \
               autoconf \
               automake \
+              bindgen \
               build-essential \
               cargo \
               cmake \
               curl \
               git \
               jq \
               make \
+              libclang-dev \
               libpcre3 \
               libpcre3-dbg \
               libpcre3-dev \
@@ -2827,13 +2862,15 @@ jobs:
           apt -y install \
               autoconf \
               automake \
+              bindgen \
               build-essential \
               cmake \
               curl \
               dpdk-dev \
               git \
               jq \
               make \
+              libclang-dev \
               libpcre3 \
               libpcre3-dbg \
               libpcre3-dev \
@@ -2912,11 +2949,13 @@ jobs:
           apt -y install \
                 automake \
                 autoconf \
+                bindgen \
                 build-essential \
                 ccache \
                 curl \
                 git \
                 jq \
+                libclang-dev \
                 libpcre2-dev \
                 libpcap-dev   \
                 libnet1-dev \
@@ -3115,11 +3154,13 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2
+          install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2
       # hack: install our own cbindgen system wide as we can't get the
       # preinstalled one to be picked up by configure
       - name: cbindgen
         run: cargo install --root /usr --force --debug --version 0.24.3 cbindgen
+      - name: bindgen
+        run: cargo install --root /usr --force --debug bindgen-cli
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: git config --global --add safe.directory /__w/suricata/suricata
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
@@ -3171,11 +3212,13 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2 libpcap-devel mingw-w64-x86_64-libpcap
+          install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2 libpcap-devel mingw-w64-x86_64-libpcap
       # hack: install our own cbindgen system wide as we can't get the
       # preinstalled one to be picked up by configure
       - name: cbindgen
         run: cargo install --root /usr --force --debug --version 0.24.3 cbindgen
+      - name: bindgen
+        run: cargo install --root /usr --force --debug bindgen-cli
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: git config --global --add safe.directory /__w/suricata/suricata
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
@@ -3215,11 +3258,13 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2 libpcap-devel mingw-w64-x86_64-libpcap
+          install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2 libpcap-devel mingw-w64-x86_64-libpcap
       # hack: install our own cbindgen system wide as we can't get the
       # preinstalled one to be picked up by configure
       - name: cbindgen
         run: cargo install --root /usr --force --debug --version 0.24.3 cbindgen
+      - name: bindgen
+        run: cargo install --root /usr --force --debug bindgen-cli
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: git config --global --add safe.directory /__w/suricata/suricata
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
@@ -3275,6 +3320,8 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
+                clang-devel \
                 diffutils \
                 numactl-devel \
                 dpdk-devel \