Skip to content

Commit a3bf82b

Browse files
catenacybervictorjulien
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.] (cherry picked from commit 6bbba95)
1 parent a0a3f20 commit a3bf82b

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
@@ -1789,7 +1789,7 @@ jobs:
17891789
- run: make check
17901790

17911791
debian-12:
1792-
name: Debian 12
1792+
name: Debian 12 (xdp)
17931793
runs-on: ubuntu-latest
17941794
container: debian:12
17951795
needs: [prepare-deps]
@@ -1847,7 +1847,9 @@ jobs:
18471847
texlive-fonts-extra \
18481848
texlive-latex-extra \
18491849
zlib1g \
1850-
zlib1g-dev
1850+
zlib1g-dev \
1851+
clang \
1852+
libxdp-dev
18511853
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
18521854
- run: git config --global --add safe.directory /__w/suricata/suricata
18531855
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
@@ -1858,13 +1860,13 @@ jobs:
18581860
- run: tar xf prep/suricata-update.tar.gz
18591861
- run: tar xf prep/suricata-verify.tar.gz
18601862
- run: ./autogen.sh
1861-
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests
1863+
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-warnings --enable-unittests --enable-ebpf --enable-ebpf-build
18621864
- run: make -j2
18631865
- run: make check
18641866
# -j2 caused random failures during cargo vendor
18651867
- run: make distcheck
18661868
env:
1867-
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-lua --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk"
1869+
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk --enable-ebpf --enable-ebpf-build"
18681870
- run: test -e doc/userguide/suricata.1
18691871
- run: test -e doc/userguide/userguide.pdf
18701872
- name: Building Rust documentation
@@ -2039,7 +2041,7 @@ jobs:
20392041
- run: suricatasc -h
20402042

20412043
debian-11:
2042-
name: Debian 11 (xdp)
2044+
name: Debian 11
20432045
runs-on: ubuntu-latest
20442046
container: debian:11
20452047
needs: [prepare-deps, prepare-cbindgen]
@@ -2052,7 +2054,6 @@ jobs:
20522054
key: cargo-registry
20532055

20542056
- run: |
2055-
echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
20562057
apt update
20572058
apt -y install \
20582059
automake \
@@ -2085,8 +2086,7 @@ jobs:
20852086
zlib1g-dev \
20862087
clang \
20872088
libbpf-dev \
2088-
libelf-dev \
2089-
libxdp-dev
2089+
libelf-dev
20902090
- name: Install Rust
20912091
run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $RUST_VERSION_KNOWN -y
20922092
- run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
@@ -2100,7 +2100,7 @@ jobs:
21002100
- run: tar xf prep/suricata-update.tar.gz
21012101
- uses: ./.github/actions/install-cbindgen
21022102
- run: ./autogen.sh
2103-
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --enable-fuzztargets --enable-ebpf --enable-ebpf-build
2103+
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-warnings --enable-unittests --enable-fuzztargets
21042104
- run: make -j2
21052105
- run: make check
21062106
- run: tar xf prep/suricata-verify.tar.gz

0 commit comments

Comments
 (0)