github-ci: add bindgen where needed

jasonish · Nov 20, 2024 · 47ace99 · 47ace99
1 parent 06e5a5c
commit 47ace99
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -93,6 +93,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen-cli \
                 cargo-vendor \
                 cbindgen \
                 diffutils \
@@ -250,6 +251,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cbindgen \
                 diffutils \
                 numactl-devel \
@@ -344,6 +346,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo-vendor \
                 cbindgen \
                 diffutils \
@@ -684,6 +687,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cbindgen \
                 ccache \
                 clang \
@@ -781,6 +785,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -880,6 +885,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -977,6 +983,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -1071,6 +1078,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -1155,6 +1163,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 ccache \
@@ -1253,6 +1262,7 @@ jobs:
           dnf -y install \
                 autoconf \
                 automake \
+                bindgen \
                 cargo \
                 cbindgen \
                 clang \
@@ -1375,6 +1385,7 @@ jobs:
           apt -y install \
                 autoconf \
                 automake \
+                bindgen \
                 build-essential \
                 cargo \
                 cbindgen \
@@ -1807,6 +1818,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -1894,6 +1906,7 @@ jobs:
           apt update
           apt -y install \
                 libpcre2-dev \
+                bindgen \
                 build-essential \
                 autoconf \
                 automake \
@@ -2819,6 +2832,7 @@ jobs:
           apt -y install \
               autoconf \
               automake \
+              bindgen \
               build-essential \
               cmake \
               curl \
@@ -2904,6 +2918,7 @@ jobs:
           apt -y install \
                 automake \
                 autoconf \
+                bindgen \
                 build-essential \
                 ccache \
                 curl \
@@ -3107,11 +3122,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
@@ -3163,11 +3180,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
@@ -3207,11 +3226,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