github-ci: break ubuntu/debian script into 2 scripts

Debian 13 ships Rust 1.85 by default, Ubuntu requires installing a
specific patch to get newer then 1.75. So to support a newer MSRV,
these operating systems need different examples.
pull/16028/head
Jason Ish 6 months ago committed by Victor Julien
parent 05882e7be0
commit 6b8c482012

@ -2783,7 +2783,43 @@ jobs:
- run: apt update -y && apt install -y sudo
- name: Install minimal dependencies
run: ./scripts/docs-ubuntu-debian-minimal-build.sh
run: ./scripts/docs-ubuntu-minimal-build.sh
# Set the path, the export in the example script does not work
# in GitHub actions.
- run: echo "/usr/lib/rust-1.89/bin:$PATH" >> $GITHUB_PATH
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure
- run: make -j ${{ env.CPUS }}
- run: ./src/suricata --build-info # check if we can run Suricata
debian-13-minimal-recommended-build:
name: Debian 13 (Minimal/Recommended Build)
needs: [ubuntu-22-04-dist]
runs-on: ubuntu-latest
container: debian:13
steps:
# Cache Rust stuff.
- name: Cache cargo registry
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9
with:
path: ~/.cargo/registry
key: cargo-registry
- name: Determine number of CPUs
run: echo CPUS=$(nproc --all) >> $GITHUB_ENV
- name: Download suricata.tar.gz
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
with:
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-debian-minimal-build.sh
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure
- run: make -j ${{ env.CPUS }}

@ -9,7 +9,8 @@ EXTRA_DIST = ChangeLog COPYING LICENSE suricata.yaml.in \
acsite.m4 \
scripts/generate-images.sh \
scripts/docs-almalinux9-minimal-build.sh \
scripts/docs-ubuntu-debian-minimal-build.sh \
scripts/docs-debian-minimal-build.sh \
scripts/docs-ubuntu-minimal-build.sh \
scripts/evedoc.py \
examples/plugins
SUBDIRS = rust src plugins qa rules doc etc python ebpf \

@ -63,13 +63,24 @@ Common configure options
Dependencies and compilation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Ubuntu/Debian
"""""""""""""
Debian 13+
""""""""""
.. note:: The following instructions require ``sudo`` to be installed.
.. literalinclude:: ../../scripts/docs-ubuntu-debian-minimal-build.sh
:caption: Minimal dependencies for Ubuntu/Debian
.. literalinclude:: ../../scripts/docs-debian-minimal-build.sh
:caption: Minimal dependencies for Debian
:language: bash
:start-after: # install-guide-documentation tag start: Minimal dependencies
:end-before: # install-guide-documentation tag end: Minimal dependencies
Ubuntu
""""""
.. note:: The following instructions require ``sudo`` to be installed.
.. literalinclude:: ../../scripts/docs-ubuntu-minimal-build.sh
:caption: Minimal dependencies for Ubuntu
:language: bash
:start-after: # install-guide-documentation tag start: Minimal dependencies
:end-before: # install-guide-documentation tag end: Minimal dependencies

@ -0,0 +1,10 @@
#!/bin/bash
# Serves for Ubuntu/Debian docs and is verified by Github Actions
# install-guide-documentation tag start: Minimal dependencies
sudo apt -y install autoconf automake build-essential cargo-1.89 \
libjansson-dev libpcap-dev libpcre2-dev libtool \
libyaml-dev make pkg-config zlib1g-dev
export PATH=/usr/lib/rust-1.89/bin:$PATH
# install-guide-documentation tag end: Minimal dependencies
Loading…
Cancel
Save