From 3611ca8c09b718b6802d95489fe587ad519e4ee5 Mon Sep 17 00:00:00 2001
From: Jason Ish <jason.ish@oisf.net>
Date: Mon, 16 Mar 2026 15:50:05 -0600
Subject: [PATCH] github-ci: update debian/ubuntu minimal build to use dist

Update the Ubuntu/Debian minimal recommended build to use the
pre-built dist archive instead of building from git, as that is the
type of build this documentation targets.

Also use the ubuntu:22.04 container. The GitHub provided Ubuntu 22.04
VM appears to contain some new additions like a newer Rust that is not
found on a typical Ubuntu 22.04 installation.

(cherry picked from commit 87dba92bdd1bae1f97c715df5198207f7074627a)
---
 .github/workflows/builds.yml                | 27 ++++++++-------------
 scripts/docs-ubuntu-debian-minimal-build.sh |  4 +--
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index e3d29fa501..1a4a99c176 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -2514,8 +2514,9 @@ jobs:
 
   ubuntu-22-04-minimal-recommended-build:
     name: Ubuntu 22.04 (Minimal/Recommended Build)
-    needs: [prepare-deps, prepare-cbindgen]
+    needs: [ubuntu-22-04-dist]
     runs-on: ubuntu-22.04
+    container: ubuntu:22.04
     steps:
       # Cache Rust stuff.
       - name: Cache cargo registry
@@ -2527,23 +2528,15 @@ jobs:
       - name: Determine number of CPUs
         run: echo CPUS=$(nproc --all) >> $GITHUB_ENV
 
-      - name: Install git dependencies
-        run: |
-          sudo apt update
-          sudo apt -y install \
-            git \
-            libtool
-
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
-      - run: git config --global --add safe.directory /__w/suricata/suricata
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+      - name: Download suricata.tar.gz
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
         with:
-          name: prep
-          path: prep
-      - run: tar xf prep/suricata-update.tar.gz
-      - run: tar xf prep/suricata-verify.tar.gz
-      - run: ./autogen.sh
-      
+          name: dist
+      - run: tar xvf suricata-*.tar.gz --strip-components=1
+
+      # Install packages required by the install script.
+      - run: apt update -y && apt install -y sudo
+
       - name: Install minimal dependencies
         run: ./scripts/docs-ubuntu-debian-minimal-build.sh
 
diff --git a/scripts/docs-ubuntu-debian-minimal-build.sh b/scripts/docs-ubuntu-debian-minimal-build.sh
index 41d163a947..3ca33e0892 100755
--- a/scripts/docs-ubuntu-debian-minimal-build.sh
+++ b/scripts/docs-ubuntu-debian-minimal-build.sh
@@ -4,6 +4,6 @@
 
 # install-guide-documentation tag start: Minimal dependencies
 sudo apt -y install autoconf automake build-essential cargo \
-    cbindgen libjansson-dev libpcap-dev libpcre2-dev libtool \
+    libjansson-dev libpcap-dev libpcre2-dev libtool \
     libyaml-dev make pkg-config rustc zlib1g-dev
-# install-guide-documentation tag end: Minimal dependencies
\ No newline at end of file
+# install-guide-documentation tag end: Minimal dependencies