Combine Workflows

GinOwO · Sep 30, 2023 · fec72e8 · fec72e8
1 parent 93f85b4
commit fec72e8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 46 deletions.
diff --git a/.github/workflows/c-cpp-build-windows.yaml b/.github/workflows/c-cpp-build-windows.yaml
diff --git a/.github/workflows/c-cpp-build-linux.yaml → .github/workflows/c-cpp-build.yaml b/.github/workflows/c-cpp-build-linux.yaml → .github/workflows/c-cpp-build.yaml
@@ -1,20 +1,21 @@
-name: Build Linux
+name: Build
 
 on:
   push:
     branches:
       - main
 
 env:
-  QT_VERSION: "6.5.0"
-  BUILD_TYPE: Release
-  COMPILER: gcc_64
-  BUILD_GEN: "Ninja"
-  COMPILER_PATH: ${{github.workspace}}/qt/Qt/6.5.0/gcc_64
+  - BUILD_TYPE: Release
+  - BUILD_GEN: "Ninja"
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
 
     steps:
     - name: Checkout code
@@ -24,9 +25,14 @@ jobs:
       uses: jurplel/install-qt-action@v3
       with:
         version: ${{ env.QT_VERSION }}
-    
-    - name: Install Ninja
+
+    - name: Install Ninja on Linux
       run: sudo apt-get install ninja-build
+      if: matrix.os == 'ubuntu-latest'
+
+    - name: Install Ninja on Windows
+      run: choco install ninja
+      if: matrix.os == 'windows-latest'
 
     - name: Build
       run: cmake -S . -B build -G "${{ env.BUILD_GEN }}" && cmake --build build --config ${{ env.BUILD_TYPE }}