From dd0f617d39f9c801d446841d13fa775f07f47894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Sat, 9 Oct 2021 16:09:20 +0200
Subject: [PATCH] build GUI with oldest and newest available Qt5 version
 (#3225)

---
 .github/workflows/CI-windows.yml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
index 42ac1d489..7f0e7b725 100644
--- a/.github/workflows/CI-windows.yml
+++ b/.github/workflows/CI-windows.yml
@@ -15,9 +15,9 @@ jobs:
   build:
     strategy:
       matrix:
-        # windows 2016 should default to VS 2017. Not supported by setup-msbuild
         os: [windows-2019]
         arch: [x64, x86]
+        qt_ver: ['', 5.9.9, 5.15.2]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -26,11 +26,13 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python 3.9
+        if: matrix.qt_ver == ''
         uses: actions/setup-python@v2
         with:
           python-version: 3.9
 
       - name: Setup msbuild.exe
+        if: matrix.qt_ver == ''
         uses: microsoft/setup-msbuild@v1.0.2
 
       - name: Install PCRE
@@ -62,20 +64,22 @@ jobs:
           Z3_VERSION: 4.8.10
 
       # no 32-bit Qt available
-      - name: Install Qt
-        if: matrix.arch == 'x64'
+      - name: Install Qt ${{ matrix.qt_ver }}
+        if: matrix.qt_ver != '' && matrix.arch == 'x64'
         uses: jurplel/install-qt-action@v2
         with:
+          version: ${{ matrix.qt_ver }}
           modules: 'qtcharts'
 
       - name: Install missing Python packages
+        if: matrix.qt_ver == ''
         run: |
-          python -m pip install pip --upgrade
-          python -m pip install pytest
-          python -m pip install pytest-custom_exit_code
+          python -m pip install pip --upgrade || exit /b !errorlevel!
+          python -m pip install pytest || exit /b !errorlevel!
+          python -m pip install pytest-custom_exit_code || exit /b !errorlevel!
 
       - name: Build GUI release
-        if: matrix.arch == 'x64'
+        if: matrix.qt_ver != '' && matrix.arch == 'x64'
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
           cd gui || exit /b !errorlevel!
@@ -85,13 +89,14 @@ jobs:
           CL: /MP
       
       - name: Deploy GUI
-        if: matrix.arch == 'x64'
+        if: matrix.qt_ver != '' && matrix.arch == 'x64'
         run: |
           windeployqt Build\gui || exit /b !errorlevel!
           del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel!
           del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel!
 
       - name: Configure MSBuild
+        if: matrix.qt_ver == ''
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
           set ARCH=${{ matrix.arch }}
@@ -101,27 +106,30 @@ jobs:
           rm -rf build
           mkdir build
           cd build
-          cmake -DBUILD_TESTS=On ..
+          cmake -DBUILD_TESTS=On .. || exit /b !errorlevel!
 
       - name: Build CLI debug configuration using MSBuild
+        if: matrix.qt_ver == ''
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
           set ARCH=${{ matrix.arch }}
           if "${{ matrix.arch }}" == "x86" (
             set ARCH=Win32
           )
-          cmake --build build --target check --config Debug
+          cmake --build build --target check --config Debug || exit /b !errorlevel!
 
       - name: Build CLI release configuration using MSBuild
+        if: matrix.qt_ver == ''
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} || exit /b !errorlevel!
           set ARCH=${{ matrix.arch }}
           if "${{ matrix.arch }}" == "x86" (
             set ARCH=Win32
           )
-          cmake --build build --target check --config Release
+          cmake --build build --target check --config Release || exit /b !errorlevel!
 
       - name: Run test/cli
+        if: matrix.qt_ver == ''
         run: |
           :: since FILESDIR is not set copy the binary to the root so the addons are found
           copy .\build\bin\Release\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel!
@@ -134,6 +142,7 @@ jobs:
           python -m pytest test-suppress-syntaxError.py || exit /b !errorlevel!
 
       - name: Test addons
+        if: matrix.qt_ver == ''
         run: |
           .\cppcheck.exe --addon=misra --inline-suppr --enable=information --error-exitcode=1 addons\test\misra\misra-ctu-*-test.c
           cd addons\test