From e4ba6dbc3f1e76890b22773807ea37fe8fa2b1bc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 10 Apr 2024 22:34:10 +0200 Subject: Adding upstream version 4.2.2. Signed-off-by: Daniel Baumann --- .github/workflows/lockdown.yml | 28 ++++++++++++++++ .github/workflows/macos.yml | 43 ++++++++++++++++++++++++ .github/workflows/msys2.yml | 53 ++++++++++++++++++++++++++++++ .github/workflows/options.yml | 48 +++++++++++++++++++++++++++ .github/workflows/ubuntu.yml | 54 ++++++++++++++++++++++++++++++ .github/workflows/windows.yml | 74 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 300 insertions(+) create mode 100644 .github/workflows/lockdown.yml create mode 100644 .github/workflows/macos.yml create mode 100644 .github/workflows/msys2.yml create mode 100644 .github/workflows/options.yml create mode 100644 .github/workflows/ubuntu.yml create mode 100644 .github/workflows/windows.yml (limited to '.github/workflows') diff --git a/.github/workflows/lockdown.yml b/.github/workflows/lockdown.yml new file mode 100644 index 00000000..bdd11ab7 --- /dev/null +++ b/.github/workflows/lockdown.yml @@ -0,0 +1,28 @@ +# Configure the Repo Lockdown GitHub App to automatically close pull requests. +# See https://github.com/dessant/repo-lockdown + +name: 'Repo Lockdown' + +on: + issues: + types: opened + pull_request_target: + types: opened + +permissions: + pull-requests: write + +jobs: + action: + runs-on: ubuntu-latest + steps: + - name: 'Repo Lockdown' + uses: dessant/repo-lockdown@v3 + with: + pr-comment: > + Hi, thank you for your contribution! + + GitHub is however not the right place for these. The development repository is + hosted on GitLab: . Please have a look at + + for further instructions. diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 00000000..7ea23317 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,43 @@ +name: Build MacOS + +on: [push] + +jobs: + macos: + name: Build & Test + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up Python 3.8 + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Install deps + run: ./tools/macos-setup-brew.sh --install-optional --install-doc-deps --install-dmg-deps --install-test-deps + env: + HOMEBREW_NO_AUTO_UPDATE: 1 + - name: Mkdir + run: mkdir build + - name: Cmake + working-directory: build + run: cmake -GNinja .. + - name: Build + run: ninja + working-directory: build + - name: Build test-programs + run: ninja test-programs + working-directory: build + - name: Run tests + env: + PYTEST_ADDOPTS: --skip-missing-programs=rawshark + run: pytest + working-directory: build + - name: Build dmg + run: ninja wireshark_dmg + working-directory: build + - name: Upload dmg packages + uses: actions/upload-artifact@v3 + with: + name: package + path: build/run/*dmg diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml new file mode 100644 index 00000000..f1252a8b --- /dev/null +++ b/.github/workflows/msys2.yml @@ -0,0 +1,53 @@ +name: Build MSYS2 + +on: [push] + +jobs: + msys2-ucrt64: + runs-on: windows-latest + defaults: + run: + shell: msys2 {0} + steps: + - name: Setup MSYS2 + uses: msys2/setup-msys2@v2 + with: + msystem: UCRT64 + update: true + install: base-devel + - name: Checkout + uses: actions/checkout@v3 + - name: Install dependencies + run: tools/msys2-setup.sh --install-all --noconfirm + - name: Build + run: | + mkdir build && cd build + cmake -G Ninja -DFETCH_lua=Yes .. + ninja + ninja test + ninja wireshark_nsis_prep + ninja wireshark_nsis + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: nsis-installer + path: build/packaging/nsis/wireshark-*-x64.exe + + install-nsis: + runs-on: windows-latest + needs: msys2-ucrt64 + steps: + - name: Download installer + uses: actions/download-artifact@v3 + with: + name: nsis-installer + path: downloads + - name: Run installer + working-directory: downloads + run: | + Get-ChildItem -Path wireshark-*-x64.exe | ForEach-Object { + Start-Process $_.FullName -ArgumentList '/S /D=C:\Wireshark' -Wait + } + - name: Show version + run: C:\Wireshark\wireshark.exe --version + diff --git a/.github/workflows/options.yml b/.github/workflows/options.yml new file mode 100644 index 00000000..61a6b7c5 --- /dev/null +++ b/.github/workflows/options.yml @@ -0,0 +1,48 @@ +name: CMake Options Test + +on: + push: + schedule: + - cron: '1 0 * * *' + +jobs: + options: + name: Build + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install deps + run: | + sudo tools/debian-setup.sh --install-all ninja-build -y + sudo gem install asciidoctor + - run: mkdir build + - name: CMake + run: >- + cmake + -GNinja + -DENABLE_BROTLI=OFF + -DENABLE_CAP=OFF + -DENABLE_CHECKHF_CONFLICT=ON + -DENABLE_GNUTLS=OFF + -DENABLE_KERBEROS=OFF + -DENABLE_LIBXML2=OFF + -DENABLE_ILBC=OFF + -DENABLE_LUA=OFF + -DENABLE_LZ4=OFF + -DENABLE_MINIZIP=OFF + -DENABLE_NETLINK=OFF + -DENABLE_NGHTTP2=OFF + -DENABLE_PCAP=OFF + -DENABLE_PLUGIN_IFDEMO=ON + -DENABLE_PLUGINS=OFF + -DENABLE_SBC=OFF + -DENABLE_SMI=OFF + -DENABLE_SNAPPY=OFF + -DENABLE_SPANDSP=OFF + -DENABLE_ZLIB=OFF + -DENABLE_ZSTD=OFF + .. + working-directory: build + - run: ninja + working-directory: build diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml new file mode 100644 index 00000000..f5353394 --- /dev/null +++ b/.github/workflows/ubuntu.yml @@ -0,0 +1,54 @@ +name: Build Ubuntu + +on: [push] + +jobs: + ubuntu: + name: Build & Test + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install deps + run: sudo tools/debian-setup.sh --install-all python3-pip -y + - name: Mkdir + run: mkdir build + - name: Cmake + working-directory: build + run: cmake -GNinja .. + - name: Build + run: ninja + working-directory: build + - name: Build test-programs + run: ninja test-programs + working-directory: build + - name: Set up Python 3.8 + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Install pytest + run: pip install pytest pytest-xdist + - name: Run tests + env: + PYTEST_ADDOPTS: --skip-missing-programs=rawshark + run: pytest + working-directory: build + - name: Build debian pkg + run: | + ln --symbolic --no-dereference --force packaging/debian + # Ignore changed symbols (on development branch). + export DPKG_GENSYMBOLS_CHECK_LEVEL=0 + tools/make-version.py --set-release . + export DEB_BUILD_OPTIONS="nocheck parallel=$(( $(getconf _NPROCESSORS_ONLN) + 2 ))" + export DH_QUIET=1 + export MAKEFLAGS=--silent + dpkg-buildpackage -b -us -uc -jauto + - name: Move deb packages + run: | + mkdir deb + mv ../*.deb deb + - name: Upload deb packages + uses: actions/upload-artifact@v3 + with: + name: packages + path: deb diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 00000000..c8059572 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,74 @@ +name: Build Windows + +on: [push] + +jobs: + windows: + name: Build & Test + runs-on: windows-2022 + env: + PLATFORM: x64 + WIRESHARK_BASE_DIR: C:\Development + CMAKE_PREFIX_PATH: D:\a\wireshark\Qt\6.2.3\msvc2019_64 + WIRESHARK_VERSION_EXTRA: -GithubActionBuild + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Choco install + run: choco install -y --force --no-progress asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake + - name: Install strawberryperl + uses: shogo82148/actions-setup-perl@v1 + with: + perl-version: '5.30' + distribution: strawberry + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + arch: win64_msvc2019_64 + version: 6.2.3 + modules: 'qt5compat' + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.1 + with: + vs-version: 16.8 + - name: Set MSVC command prompt + uses: ilammy/msvc-dev-cmd@v1 + - name: Mkdir + run: mkdir build + - name: Cmake + run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. + env: + PLATFORM: x64 + WIRESHARK_BASE_DIR: C:/wireshark-libs + QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 + working-directory: build + - name: Build + run: cmake --build . --config RelWithDebInfo + working-directory: build + - name: Build guides + run: cmake --build . --config RelWithDebInfo --target user_guide_html + working-directory: build + - name: Build test-programs + run: cmake --build . --config RelWithDebInfo --target test-programs + working-directory: build + - name: Set up Python 3.8 + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Install pytest + run: pip install pytest pytest-xdist + - name: Run tests + env: + PYTEST_ADDOPTS: --skip-missing-programs=rawshark + run: pytest + working-directory: build + - name: Build Windows pkg + run: | + msbuild /m /p:Configuration=RelWithDebInfo wireshark_nsis_prep.vcxproj + msbuild /m /p:Configuration=RelWithDebInfo wireshark_nsis.vcxproj + working-directory: build + - name: Upload Windows packages + uses: actions/upload-artifact@v3 + with: + name: package + path: build/packaging/nsis/*exe -- cgit v1.2.3