diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 89c3db74..3ea9339b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -23,6 +23,8 @@ jobs: arch: win64_msvc2022_64 - version: 6.8.2 arch: win64_msvc2019_64 + - version: 6.8.2 + arch: win64_mingw steps: - name: Pull code uses: actions/checkout@v4 diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 2d01f7d9..8dd88503 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -14,8 +14,15 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - version: [6.8.*] - arch: [linux_gcc_64] + version: [6.2.4, 6.5.3, 6.8.2] + arch: [gcc_64, linux_gcc_64] + exclude: + - version: 6.2.4 + arch: linux_gcc_64 + - version: 6.5.3 + arch: linux_gcc_64 + - version: 6.8.2 + arch: gcc_64 steps: - name: checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 68420ce7..487b320d 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -9,17 +9,22 @@ on: # - master jobs: build: - name: Build MSVC + name: Build with Qt6 runs-on: windows-2022 strategy: fail-fast: false matrix: - version: [6.5.3, 6.8.2] - include: + version: [6.2.4, 6.5.3, 6.8.2] + arch: [win64_msvc2019_64, win64_msvc2022_64, win64_mingw] + exclude: + - version: 6.2.4 + arch: win64_msvc2022_64 - version: 6.5.3 + arch: win64_msvc2022_64 + - version: 6.8.2 arch: win64_msvc2019_64 - version: 6.8.2 - arch: win64_msvc2022_64 + arch: win64_mingw steps: - name: Pull code uses: actions/checkout@v4 @@ -34,9 +39,18 @@ jobs: modules: 'qtcharts qtserialbus qtserialport qtwebsockets' - name: build-msvc shell: cmd + if: matrix.arch == 'win64_msvc2019_64' || matrix.arch == 'win64_msvc2022_64' run: | mkdir build cd build call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 cmake -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/${{ matrix.version }}/${{ matrix.arch }}' -DCMAKE_BUILD_TYPE=Release -G "Ninja" ../ cmake --build . --target all --config Release + - name: build-mingw + shell: cmd + if: matrix.arch == 'win64_mingw' + run: | + mkdir build + cd build + cmake -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/${{ matrix.version }}/${{ matrix.arch }}' -DCMAKE_BUILD_TYPE=Release -G "MinGW Makefiles" ../ + cmake --build . --target all --config Release