From 551f6ded69537b6bd6ff796ee2dbc9bc8fce2114 Mon Sep 17 00:00:00 2001
From: Jason Ish <jason.ish@oisf.net>
Date: Mon, 16 Mar 2026 15:53:50 -0600
Subject: [PATCH] github-ci: update almalinux minimal build to use dist archive

Update the AlmaLinux recommended minimal build to use the pre built
distribution archive as this is the type of build the documentation is
targetting.
---
 .github/workflows/builds.yml             | 36 ++++++++----------------
 scripts/docs-almalinux9-minimal-build.sh |  6 ++--
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index a82544c91c..c34b174cb8 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -1300,7 +1300,7 @@ jobs:
     name: AlmaLinux 9 (Minimal/Recommended Build)
     runs-on: ubuntu-latest
     container: almalinux:9
-    needs: [prepare-deps, prepare-cbindgen]
+    needs: [ubuntu-22-04-dist]
     steps:
       # Cache Rust stuff.
       - name: Cache cargo registry
@@ -1312,36 +1312,24 @@ jobs:
       - name: Determine number of CPUs
         run: echo CPUS=$(nproc --all) >> $GITHUB_ENV
 
-      - name: Install git dependencies
-        run: |
-          dnf -y install \
-            sudo \
-            git \
-            libtool \
-            which
+      - name: Download suricata.tar.gz
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
+        with:
+          name: dist
+      - run: tar xf suricata-*.tar.gz --strip-components=1
 
-      - name: Install Almalinux 9 extra repositories
-        run : |
+      - name: Update packages and install sudo
+        run: dnf -y update && dnf install -y sudo
+
+      - name: Install AlmaLinux 9 extra repositories
+        run: |
           dnf -y update
-          dnf -y install dnf-plugins-core epel-release
+          dnf -y install dnf-plugins-core epel-release sudo
           dnf config-manager --set-enabled crb
 
-
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-      - uses: ./.github/actions/install-cbindgen
-      - run: git config --global --add safe.directory /__w/suricata/suricata
-      - uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
-      
       - name: Install minimal dependencies
         run: ./scripts/docs-almalinux9-minimal-build.sh
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-      - run: git config --global --add safe.directory /__w/suricata/suricata
-      - uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
-        with:
-          name: prep
-          path: prep
-      - run: ./autogen.sh
       - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure
       - run: make -j ${{ env.CPUS }}
       - run: ./src/suricata --build-info # check if we can run Suricata
diff --git a/scripts/docs-almalinux9-minimal-build.sh b/scripts/docs-almalinux9-minimal-build.sh
index 2b569ff72d..565cd4c2ea 100755
--- a/scripts/docs-almalinux9-minimal-build.sh
+++ b/scripts/docs-almalinux9-minimal-build.sh
@@ -3,7 +3,7 @@
 # Serves for RPM-based docs and is verified by Github Actions
 
 # install-guide-documentation tag start: Minimal RPM-based dependencies
-sudo dnf install -y rustc cargo cbindgen
-sudo dnf install -y gcc gcc-c++ jansson-devel libpcap-devel \
+sudo dnf install -y dnf-plugins-core epel-release
+sudo dnf install -y cargo gcc jansson-devel libpcap-devel \
     libyaml-devel make pcre2-devel zlib-devel
-# install-guide-documentation tag end: Minimal RPM-based dependencies
\ No newline at end of file
+# install-guide-documentation tag end: Minimal RPM-based dependencies