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.
pull/15039/head
Jason Ish 1 month ago committed by Victor Julien
parent 87dba92bdd
commit 551f6ded69

@ -1300,7 +1300,7 @@ jobs:
name: AlmaLinux 9 (Minimal/Recommended Build) name: AlmaLinux 9 (Minimal/Recommended Build)
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: almalinux:9 container: almalinux:9
needs: [prepare-deps, prepare-cbindgen] needs: [ubuntu-22-04-dist]
steps: steps:
# Cache Rust stuff. # Cache Rust stuff.
- name: Cache cargo registry - name: Cache cargo registry
@ -1312,36 +1312,24 @@ jobs:
- name: Determine number of CPUs - name: Determine number of CPUs
run: echo CPUS=$(nproc --all) >> $GITHUB_ENV run: echo CPUS=$(nproc --all) >> $GITHUB_ENV
- name: Install git dependencies - name: Download suricata.tar.gz
run: | uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
dnf -y install \ with:
sudo \ name: dist
git \ - run: tar xf suricata-*.tar.gz --strip-components=1
libtool \
which - name: Update packages and install sudo
run: dnf -y update && dnf install -y sudo
- name: Install Almalinux 9 extra repositories - name: Install AlmaLinux 9 extra repositories
run : | run: |
dnf -y update 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 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 - name: Install minimal dependencies
run: ./scripts/docs-almalinux9-minimal-build.sh 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: CFLAGS="${DEFAULT_CFLAGS}" ./configure
- run: make -j ${{ env.CPUS }} - run: make -j ${{ env.CPUS }}
- run: ./src/suricata --build-info # check if we can run Suricata - run: ./src/suricata --build-info # check if we can run Suricata

@ -3,7 +3,7 @@
# Serves for RPM-based docs and is verified by Github Actions # Serves for RPM-based docs and is verified by Github Actions
# install-guide-documentation tag start: Minimal RPM-based dependencies # install-guide-documentation tag start: Minimal RPM-based dependencies
sudo dnf install -y rustc cargo cbindgen sudo dnf install -y dnf-plugins-core epel-release
sudo dnf install -y gcc gcc-c++ jansson-devel libpcap-devel \ sudo dnf install -y cargo gcc jansson-devel libpcap-devel \
libyaml-devel make pcre2-devel zlib-devel libyaml-devel make pcre2-devel zlib-devel
# install-guide-documentation tag end: Minimal RPM-based dependencies # install-guide-documentation tag end: Minimal RPM-based dependencies
Loading…
Cancel
Save