diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 1a4a99c176..328faa8e50 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -1229,7 +1229,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 @@ -1241,36 +1241,22 @@ jobs: - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV - - name: Install git dependencies + - name: Download suricata.tar.gz + uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 + with: + name: dist + - run: tar xf suricata-*.tar.gz --strip-components=1 + + # Some packages are not in the script, but documented as they differ + # based on variant/version of RHEL. + - name: Install prerequisites not covered by script run: | - dnf -y install \ - sudo \ - git \ - libtool \ - which - - - name: Install Almalinux 9 extra repositories - run : | - dnf -y update - dnf -y install dnf-plugins-core epel-release + dnf -y install sudo dnf-plugins-core epel-release dnf config-manager --set-enabled crb - - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - - uses: ./.github/actions/install-cbindgen - - run: git config --global --add safe.directory /__w/suricata/suricata - - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 - - name: Install minimal dependencies run: ./scripts/docs-almalinux9-minimal-build.sh - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - - run: git config --global --add safe.directory /__w/suricata/suricata - - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 - 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..546c7e447a 100755 --- a/scripts/docs-almalinux9-minimal-build.sh +++ b/scripts/docs-almalinux9-minimal-build.sh @@ -3,7 +3,6 @@ # 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 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