Debug windows workflow

cgxxv · Mar 11, 2024 · 1887383 · 1887383
1 parent 8d042df
commit 1887383
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/.github/workflows/qt-ubuntu.yml b/.github/workflows/qt-ubuntu.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - name: build ubuntu
+      - name: Build Ubuntu
         env:
           QT_VERSION: ${{ matrix.qt.version }}
           CMAKE_PREFIX_PATH: ${{ github.workspace }}/../Qt/${{ matrix.qt.version }}/gcc_64/lib/cmake

diff --git a/.github/workflows/qt-windows.yml b/.github/workflows/qt-windows.yml
@@ -18,16 +18,40 @@ jobs:
         qt:
           - version: 6.5.3
             modules: qtwebengine qtwebchannel qtpositioning
+        include:
+          - { icon: '⬛', sys: mingw32 }
+          - { icon: '🟦', sys: mingw64 }
+          - { icon: '🟨', sys: ucrt64  }
+          - { icon: '🟧', sys: clang64 }
+    name: 🚧${{ matrix.icon }} ${{ matrix.sys }}
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
+    - name: Setup MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{matrix.sys}}
+        update: true
+        install: >-
+          git
+          make
+        pacboy: >-
+          toolchain:p
+          cmake:p
+          ninja:p
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt.version }}
           modules: ${{ matrix.qt.modules }}
           # arch: ${{ matrix.qt_arch }}
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
+
       - name: Set up Qt environment
         shell: powershell
         run: |
@@ -42,7 +66,8 @@ jobs:
           Write-Output "QT_VERSION=$QtVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Write-Output "CMAKE_PREFIX_PATH=$QtInstallDir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Write-Output "CMAKE_BUILD_TYPE=$CMakeBuildType" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      - name: Build Msvc
+
+      - name: Build Windows
         shell: powershell
         run: |
           # Get-ChildItem -Path "${{ github.workspace }}\.."
@@ -51,7 +76,7 @@ jobs:
           # Get-ChildItem
           mkdir build
           cd build
-          cmake ..
+          cmake -G Ninja ..
           Get-ChildItem
           cmake --build .
           Get-ChildItem