ci: insert build_type directly into matrix

morinim · Jun 19, 2024 · 3288f8e · 3288f8e
1 parent 6c2d2aa
commit 3288f8e
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -12,45 +12,41 @@ on:
 
 jobs:
   build-test:
-    name: ${{matrix.config.name}}
+    name: ${{matrix.config.name}} ${{matrix.build_type}}
     runs-on: ${{matrix.config.os}}
     strategy:
       fail-fast: false
       matrix:
+        build_type: ["Debug", "Release"]
         config:
         - {
             name: "Windows Latest MSVC Debug",
             artifact: "windows-msvc-debug.txz",
             os: windows-latest,
-            build_type: "Debug",
             cc: "cl", cxx: "cl"
           }
         - {
             name: "Windows Latest MSVC Release",
             artifact: "windows-msvc-release.txz",
             os: windows-latest,
-            build_type: "Release",
             cc: "cl", cxx: "cl"
           }
         - {
             name: "Ubuntu Latest GCC Debug",
             artifact: "linux-debug.txz",
             os: ubuntu-latest,
-            build_type: "Debug",
             cc: "gcc", cxx: "g++"
           }
         - {
             name: "Ubuntu Latest GCC Releas",
             artifact: "linux-release.txz",
             os: ubuntu-latest,
-            build_type: "Release",
             cc: "gcc", cxx: "g++"
           }
         #- {
         #    name: "macOS Latest Clang",
         #    artifact: "macos.txz",
         #    os: macos-latest,
-        #    build_type: "Release",
         #    cc: "clang", cxx: "clang++"
         #  }
 
@@ -65,12 +61,12 @@ jobs:
         shell: bash
         working-directory: ${{github.workspace}}
         run: |
-          cmake -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} -B build/ src/
-          cmake --build build/ --config ${{matrix.config.build_type}}
+          cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -B build/ src/
+          cmake --build build/ --config ${{matrix.build_type}}
       - name: Test
         shell: bash
         working-directory: ${{github.workspace}}/build/test
-        run: ctest --output-on-failure -C ${{matrix.config.build_type}}
+        run: ctest --output-on-failure -C ${{matrix.build_type}}
 
       #- name: Pack
       #  working-directory: ${{github.workspace}}/build