diff options
| author | Chuck Craft <bubbasnmp@gmail.com> | 2022-09-22 09:38:27 -0500 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-09-22 15:04:52 +0000 |
| commit | 673bd6aca3aa0ea808faf4929165135c07c8de55 (patch) | |
| tree | 92fe5bac2cc9cea997f3394843012915b28a7e13 /.github | |
| parent | a9092f256eb299768b260c369bd81f14fffb1709 (diff) | |
github: fix Windows action (Qt6; NSIS; Cmake -D syntax)
Ref: #18352, !8189, !7067, !5598
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/windows.yml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1f42b9abf8..7c61fdfa92 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -5,7 +5,12 @@ 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 @@ -19,7 +24,11 @@ jobs: 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.1 with: @@ -29,7 +38,7 @@ jobs: - name: Mkdir run: mkdir build - name: Cmake - run: cmake -DCMAKE_SYSTEM_VERSION=10.0.20348.0 -A x64 .. + run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. env: PLATFORM: x64 WIRESHARK_BASE_DIR: C:/wireshark-libs @@ -57,8 +66,8 @@ 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: Upload Windows packages uses: actions/upload-artifact@v2 |