diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d4e10b8..1ae97a8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 @@ -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: | @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f0fbabd..b5dd762 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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: | @@ -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