Skip to content

Fix build errors on Windows #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oshaked1 merged 2 commits into from
Jul 16, 2025
Merged

Fix build errors on Windows #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5462d2a
Fix build errors on Windows
oshaked1 Jul 15, 2025
82d2693
Bump release Wireshark version to 4.4.7
oshaked1 Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
# macos-14 is ARM64, macos-13 is x86-64
os: [ubuntu-latest, macos-14, macos-13, windows-latest, ubuntu_arm64]
wireshark_version: [wireshark-4.2.6, wireshark-4.4.5]
wireshark_version: [wireshark-4.2.6, wireshark-4.4.7]
include:
# Ubuntu 22.04 Wireshark package version
- os: ubuntu-latest
Expand Down Expand Up @@ -53,6 +53,13 @@ jobs:
if: (matrix.os == 'ubuntu_arm64' || matrix.os == 'ubuntu-latest') && matrix.wireshark_version == 'wireshark-3.6.2'
run: echo "WERROR=n" >> $GITHUB_ENV

# Wireshark has compilation warnings on Wireshark 4.2.6 on Windows
- name: Disable WERROR (Windows, Wireshark 4.2.6)
if: matrix.os == 'windows-latest' && matrix.wireshark_version == 'wireshark-4.2.6'
shell: pwsh
run: |
"WERROR=n" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append

- name: Install dependencies (Ubuntu)
if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu_arm64'
run: |
Expand Down Expand Up @@ -98,10 +105,12 @@ jobs:

- name: Build Traceeshark (Windows)
if: matrix.os == 'windows-latest'
env:
WERROR: ${{ env.WERROR || 'y' }}
run: |
echo WERROR value: %WERROR%
set WIRESHARK_BASE_DIR=%CD%
set WIRESHARK_QT6_PREFIX_PATH=$QT_ROOT_DIR
set WERROR=y
call scripts\cmake.bat
call scripts\build.bat
shell: cmd
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
matrix:
# macos-14 is ARM64, macos-13 is x86-64
os: [ubuntu-latest, macos-14, macos-13, windows-latest, ubuntu_arm64]
wireshark_version: [wireshark-4.2.6, wireshark-4.4.5]
wireshark_version: [wireshark-4.2.6, wireshark-4.4.7]
include:
# Ubuntu 22.04 Wireshark package version
- os: ubuntu-latest
Expand Down Expand Up @@ -78,6 +78,13 @@ jobs:
if: (matrix.os == 'ubuntu_arm64' || matrix.os == 'ubuntu-latest') && matrix.wireshark_version == 'wireshark-3.6.2'
run: echo "WERROR=n" >> $GITHUB_ENV

# Wireshark has compilation warnings on Wireshark 4.2.6 on Windows
- name: Disable WERROR (Windows, Wireshark 4.2.6)
if: matrix.os == 'windows-latest' && matrix.wireshark_version == 'wireshark-4.2.6'
shell: pwsh
run: |
"WERROR=n" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append

- name: Install dependencies (Ubuntu)
if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu_arm64'
run: |
Expand Down Expand Up @@ -123,10 +130,12 @@ jobs:

- name: Build Traceeshark (Windows)
if: matrix.os == 'windows-latest'
env:
WERROR: ${{ env.WERROR || 'y' }}
run: |
echo WERROR value: %WERROR%
set WIRESHARK_BASE_DIR=%CD%
set WIRESHARK_QT6_PREFIX_PATH=$QT_ROOT_DIR
set WERROR=y
call scripts\cmake.bat
call scripts\build.bat
shell: cmd
Expand Down
Loading