aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/FUNDING.yml14
-rw-r--r--.github/lockdown.yml10
-rw-r--r--.github/workflows/lockdown.yml28
-rw-r--r--.github/workflows/macos.yml34
-rw-r--r--.github/workflows/msys2.yml53
-rw-r--r--.github/workflows/options.yml9
-rw-r--r--.github/workflows/ubuntu.yml20
-rw-r--r--.github/workflows/windows.yml41
8 files changed, 146 insertions, 63 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..073eec6f09
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+# patreon: # Replace with a single Patreon username
+# open_collective: # Replace with a single Open Collective username
+# ko_fi: # Replace with a single Ko-fi username
+# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+# liberapay: # Replace with a single Liberapay username
+# issuehunt: # Replace with a single IssueHunt username
+# otechie: # Replace with a single Otechie username
+# lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+
+custom: ["https://wiresharkfoundation.org/donate/"]
diff --git a/.github/lockdown.yml b/.github/lockdown.yml
deleted file mode 100644
index 8135fc7ade..0000000000
--- a/.github/lockdown.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configure the Repo Lockdown GitHub App to automatically close pull requests.
-# See https://github.com/apps/repo-lockdown
-
-pulls:
- comment: |
- Hi, thank you for your contribution!
-
- GitHub is however not the right place for these, please have a look at
- <https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcContribute.html>
- for further instructions.
diff --git a/.github/workflows/lockdown.yml b/.github/workflows/lockdown.yml
new file mode 100644
index 0000000000..bdd11ab7de
--- /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: <https://gitlab.com/wireshark/wireshark>. Please have a look at
+ <https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcContribute.html>
+ for further instructions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 2808e0a6f2..7ea2331726 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -5,28 +5,18 @@ on: [push]
jobs:
macos:
name: Build & Test
- runs-on: macos-11.0
+ runs-on: macos-latest
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Set up Python 3.8
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v4
with:
python-version: 3.8
- - name: Install dmgbuild
- run: pip3 install dmgbuild
- - name: Install pytest
- run: pip install pytest pytest-xdist
- - name: Install biplist
- run: pip install biplist
- - name: Set up Ruby 2.6
- uses: actions/setup-ruby@v1.1.2
- with:
- ruby-version: '2.6'
- name: Install deps
- run: ./tools/macos-setup-brew.sh
- - name: Install asciidoctor
- run: gem install asciidoctor
+ 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
@@ -44,14 +34,10 @@ jobs:
run: pytest
working-directory: build
- name: Build dmg
- run: ninja dmg_package
+ run: ninja wireshark_dmg
working-directory: build
- - name: Move dmg package
- run: |
- mkdir dmg
- mv build/run/*dmg dmg/
- name: Upload dmg packages
- uses: actions/upload-artifact@v1
+ uses: actions/upload-artifact@v3
with:
- name: packages
- path: dmg
+ name: package
+ path: build/run/*dmg
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
new file mode 100644
index 0000000000..f1252a8b90
--- /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
index 1a5e65e82a..61a6b7c567 100644
--- a/.github/workflows/options.yml
+++ b/.github/workflows/options.yml
@@ -8,12 +8,14 @@ on:
jobs:
options:
name: Build
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install deps
- run: sudo tools/debian-setup.sh ninja-build -y
+ run: |
+ sudo tools/debian-setup.sh --install-all ninja-build -y
+ sudo gem install asciidoctor
- run: mkdir build
- name: CMake
run: >-
@@ -21,7 +23,6 @@ jobs:
-GNinja
-DENABLE_BROTLI=OFF
-DENABLE_CAP=OFF
- -DENABLE_CARES=OFF
-DENABLE_CHECKHF_CONFLICT=ON
-DENABLE_GNUTLS=OFF
-DENABLE_KERBEROS=OFF
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 695badd6a3..f5353394c5 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -5,12 +5,12 @@ on: [push]
jobs:
ubuntu:
name: Build & Test
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install deps
- run: sudo tools/debian-setup.sh --install-optional --install-test-deps --install-deb-deps python3-pip -y
+ run: sudo tools/debian-setup.sh --install-all python3-pip -y
- name: Mkdir
run: mkdir build
- name: Cmake
@@ -23,7 +23,7 @@ jobs:
run: ninja test-programs
working-directory: build
- name: Set up Python 3.8
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Install pytest
@@ -34,13 +34,21 @@ jobs:
run: pytest
working-directory: build
- name: Build debian pkg
- run: dpkg-buildpackage -b -us -uc -jauto
+ 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@v1
+ uses: actions/upload-artifact@v3
with:
name: packages
path: deb
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ee5be2662a..c8059572e3 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -5,31 +5,38 @@ on: [push]
jobs:
windows:
name: Build & Test
- runs-on: windows-latest
+ 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@v2
+ uses: actions/checkout@v3
- name: Choco install
- run: cinst -y --force --no-progress asciidoctorj xsltproc docbook-bundle cmake nsis
- - name: Install winflexbison3
- run: cinst -y --force winflexbison3 --version 2.5.18.20190508
+ 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@v2
+ 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.0.2
+ uses: microsoft/setup-msbuild@v1.1
with:
- vs-version: 16.4
+ vs-version: 16.8
- name: Set MSVC command prompt
uses: ilammy/msvc-dev-cmd@v1
- name: Mkdir
run: mkdir build
- name: Cmake
- run: cmake -A x64 ..
+ run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 ..
env:
PLATFORM: x64
WIRESHARK_BASE_DIR: C:/wireshark-libs
@@ -45,7 +52,7 @@ jobs:
run: cmake --build . --config RelWithDebInfo --target test-programs
working-directory: build
- name: Set up Python 3.8
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Install pytest
@@ -57,15 +64,11 @@ jobs:
working-directory: build
- name: Build Windows pkg
run: |
- msbuild /m /p:Configuration=RelWithDebInfo nsis_package_prep.vcxproj
- msbuild /m /p:Configuration=RelWithDebInfo nsis_package.vcxproj
+ msbuild /m /p:Configuration=RelWithDebInfo wireshark_nsis_prep.vcxproj
+ msbuild /m /p:Configuration=RelWithDebInfo wireshark_nsis.vcxproj
working-directory: build
- - name: Move Windows packages
- run: |
- mkdir exe
- mv build/packaging/nsis/*exe exe/
- name: Upload Windows packages
- uses: actions/upload-artifact@v1
+ uses: actions/upload-artifact@v3
with:
- name: packages
- path: exe
+ name: package
+ path: build/packaging/nsis/*exe
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 12:01:36 +0000