Skip to content

Commit 6bbba95

Browse files
catenacyberjasonish
authored andcommitted
ci: use debian 12 for xdp
As bullseye is EOL so it is being removed from the mirrors https://lists.debian.org/debian-backports/2024/07/msg00003.html [Edit by JI: Add xdp to distcheck build as well.]
1 parent 2e69e0d commit 6bbba95

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/builds.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2388,7 +2388,7 @@ jobs:
23882388
./.github/workflows/live/dpdk.sh ".github/workflows/dpdk/suricata-null-ips.yaml"
23892389
23902390
debian-12:
2391-
name: Debian 12
2391+
name: Debian 12 (xdp)
23922392
runs-on: ubuntu-latest
23932393
container: debian:12
23942394
needs: [prepare-deps]
@@ -2446,7 +2446,9 @@ jobs:
24462446
texlive-fonts-extra \
24472447
texlive-latex-extra \
24482448
zlib1g \
2449-
zlib1g-dev
2449+
zlib1g-dev \
2450+
clang \
2451+
libxdp-dev
24502452
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
24512453
- run: git config --global --add safe.directory /__w/suricata/suricata
24522454
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
@@ -2460,13 +2462,13 @@ jobs:
24602462
- run: tar xf prep/suricata-update.tar.gz
24612463
- run: tar xf prep/suricata-verify.tar.gz
24622464
- run: ./autogen.sh
2463-
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-warnings --enable-unittests
2465+
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-warnings --enable-unittests --enable-ebpf --enable-ebpf-build
24642466
- run: make -j ${{ env.CPUS }}
24652467
- run: make check
24662468
# -j2 caused random failures during cargo vendor
24672469
- run: make distcheck
24682470
env:
2469-
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk"
2471+
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk --enable-ebpf --enable-ebpf-build"
24702472
- run: test -e doc/userguide/suricata.1
24712473
- run: test -e doc/userguide/userguide.pdf
24722474
- name: Building Rust documentation
@@ -2646,7 +2648,7 @@ jobs:
26462648
- run: suricatasc -h
26472649

26482650
debian-11:
2649-
name: Debian 11 (xdp)
2651+
name: Debian 11
26502652
runs-on: ubuntu-latest
26512653
container: debian:11
26522654
needs: [prepare-deps, prepare-cbindgen]
@@ -2662,7 +2664,6 @@ jobs:
26622664
run: echo CPUS=$(nproc --all) >> $GITHUB_ENV
26632665

26642666
- run: |
2665-
echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
26662667
apt update
26672668
apt -y install \
26682669
automake \
@@ -2696,8 +2697,7 @@ jobs:
26962697
zlib1g-dev \
26972698
clang \
26982699
libbpf-dev \
2699-
libelf-dev \
2700-
libxdp-dev
2700+
libelf-dev
27012701
- name: Install Rust
27022702
run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $RUST_VERSION_KNOWN -y
27032703
- run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
@@ -2710,7 +2710,7 @@ jobs:
27102710
- run: tar xf prep/suricata-update.tar.gz
27112711
- uses: ./.github/actions/install-cbindgen
27122712
- run: ./autogen.sh
2713-
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-warnings --enable-unittests --enable-fuzztargets --enable-ebpf --enable-ebpf-build
2713+
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-warnings --enable-unittests --enable-fuzztargets
27142714
- run: make -j ${{ env.CPUS }}
27152715
- run: make check
27162716
- run: tar xf prep/suricata-verify.tar.gz

0 commit comments

Comments
 (0)