@@ -1229,7 +1229,7 @@ jobs:
12291229 name : AlmaLinux 9 (Minimal/Recommended Build)
12301230 runs-on : ubuntu-latest
12311231 container : almalinux:9
1232- needs : [prepare-deps, prepare-cbindgen ]
1232+ needs : [ubuntu-22-04-dist ]
12331233 steps :
12341234 # Cache Rust stuff.
12351235 - name : Cache cargo registry
@@ -1241,36 +1241,22 @@ jobs:
12411241 - name : Determine number of CPUs
12421242 run : echo CPUS=$(nproc --all) >> $GITHUB_ENV
12431243
1244- - name : Install git dependencies
1244+ - name : Download suricata.tar.gz
1245+ uses : actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
1246+ with :
1247+ name : dist
1248+ - run : tar xf suricata-*.tar.gz --strip-components=1
1249+
1250+ # Some packages are not in the script, but documented as they differ
1251+ # based on variant/version of RHEL.
1252+ - name : Install prerequisites not covered by script
12451253 run : |
1246- dnf -y install \
1247- sudo \
1248- git \
1249- libtool \
1250- which
1251-
1252- - name : Install Almalinux 9 extra repositories
1253- run : |
1254- dnf -y update
1255- dnf -y install dnf-plugins-core epel-release
1254+ dnf -y install sudo dnf-plugins-core epel-release
12561255 dnf config-manager --set-enabled crb
12571256
1258-
1259- - uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1260- - uses : ./.github/actions/install-cbindgen
1261- - run : git config --global --add safe.directory /__w/suricata/suricata
1262- - uses : actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
1263-
12641257 - name : Install minimal dependencies
12651258 run : ./scripts/docs-almalinux9-minimal-build.sh
12661259
1267- - uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1268- - run : git config --global --add safe.directory /__w/suricata/suricata
1269- - uses : actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
1270- with :
1271- name : prep
1272- path : prep
1273- - run : ./autogen.sh
12741260 - run : CFLAGS="${DEFAULT_CFLAGS}" ./configure
12751261 - run : make -j ${{ env.CPUS }}
12761262 - run : ./src/suricata --build-info # check if we can run Suricata
0 commit comments