From 5c854e404128eead2b38e7055e37bf2c45c3d41e Mon Sep 17 00:00:00 2001 From: Xin Long Date: Tue, 11 Feb 2025 11:05:53 -0500 Subject: [PATCH] github: use the new wireshark nightly PPA in workflows interop With this, we no longer need to compile wireshark manually. Signed-off-by: Xin Long --- .github/workflows/interop.yml | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml index 9dd8166..8b365f4 100644 --- a/.github/workflows/interop.yml +++ b/.github/workflows/interop.yml @@ -12,11 +12,10 @@ jobs: steps: - name: Install dependencies run: | + sudo add-apt-repository ppa:wireshark-dev/nightly sudo apt-get update - sudo apt-get -y install make autoconf automake libtool pkg-config \ - gnutls-dev linux-headers-$(uname -r) - sudo apt-get -y install cmake flex bison byacc ninja-build python3-pip \ - libgcrypt20-dev libc-ares-dev libglib2.0-dev libpcap-dev + sudo apt-get install -y gnutls-dev + sudo apt-get install -y --no-install-recommends tshark - name: Checkout linuxquic uses: actions/checkout@v4 @@ -27,23 +26,6 @@ jobs: make -C modules sudo make -C modules install - # wireshark - - name: Checkout wireshark - uses: actions/checkout@v4 - with: - repository: wireshark/wireshark - path: wireshark - - name: Install wireshark - run: | - cd wireshark - cmake -GNinja -DBUILD_wireshark=0 -DBUILD_qtshark=0 -DBUILD_editcap=1 \ - -DBUILD_capinfos=0 -DBUILD_text2pcap=0 -DBUILD_rawshark=0 -DBUILD_sdjournal=0 \ - -DBUILD_sshdump=0 -DBUILD_ciscodump=0 -DBUILD_sharkd=0 -DENABLE_STATIC=1 \ - -DENABLE_PLUGINS=0 -DENABLE_LIBXML2=0 -DENABLE_BROTLI=0 -DENABLE_GNUTLS=1 . - ninja - sudo ninja install - cd ../ - # quic-interop-runner - name: Checkout quic-interop-runner uses: actions/checkout@v4