[GITHUB] Update CI to match new presets

Author: aliendroid1

.github/workflows/build-toolchain.yml

@@ -15,6 +15,10 @@ on:
         required: true
         type: string
         description: "CMake preset"
+      configuration:
+        required: true
+        type: string
+        description: "CMake build configuration (Debug, Release, RelWithDebInfo, etc)"
       tools:
         required: false
         default: true
@@ -51,7 +55,7 @@ jobs:
           key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
 
       - name: Download VC6 Portable from Cloudflare R2
-        if: ${{ startsWith(inputs.preset, 'vc6') && steps.cache-vc6.outputs.cache-hit != 'true' }}
+        if: ${{ endsWith(inputs.preset, 'vc6') && steps.cache-vc6.outputs.cache-hit != 'true' }}
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
@@ -95,13 +99,13 @@ jobs:
           "LIB=$MSVCDir\LIB;$MSVCDir\MFC\LIB;$env:LIB" >> $env:GITHUB_ENV
 
       - name: Set Up VC2022 Environment
-        if: startsWith(inputs.preset, 'win32')
+        if: ${{ !endsWith(inputs.preset, 'vc6') }}
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x86
 
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
+      #- name: Setup vcpkg
+      #  uses: lukka/run-vcpkg@v11
 
       - name: Configure ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset
         shell: pwsh
@@ -124,7 +128,7 @@ jobs:
       - name: Build ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset
         shell: pwsh
         run: |
-          cmake --build --preset ${{ inputs.preset }}
+          cmake --build --preset ${{ inputs.preset }} --config ${{ inputs.configuration }}
 
       - name: Collect ${{ inputs.game }} ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Artifact
         shell: pwsh

.github/workflows/ci.yml

@@ -63,41 +63,39 @@ jobs:
     strategy:
       matrix:
         include:
-          - preset: "vc6"
+          # ninja preset
+          - preset: "ninja"
             tools: true
             extras: true
-          - preset: "vc6-profile"
+            configuration: "Debug"
+          - preset: "ninja"
             tools: true
             extras: true
-          - preset: "vc6-debug"
+            configuration: "Release"
+          - preset: "ninja"
             tools: true
             extras: true
-          - preset: "win32"
+            configuration: "RelWithDebInfo"
+          # ninja-vc6 preset
+          - preset: "ninja-vc6"
             tools: true
             extras: true
-          - preset: "win32-profile"
+            configuration: "Debug"
+          - preset: "ninja-vc6"
             tools: true
             extras: true
-          - preset: "win32-debug"
+            configuration: "Release"
+          - preset: "ninja-vc6"
             tools: true
             extras: true
-          # vcpkg builds have been disabled for now due to excessive build times of 30 minutes per preset
-          # - preset: "win32-vcpkg"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-profile"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-debug"
-          #   tools: true
-          #   extras: true
-      fail-fast: false
+            configuration: "RelWithDebInfo"
     uses: ./.github/workflows/build-toolchain.yml
     with:
       game: "Generals"
       preset: ${{ matrix.preset }}
       tools: ${{ matrix.tools }}
       extras: ${{ matrix.extras }}
+      configuration: ${{ matrix.configuration }}
     secrets: inherit
 
   build-generalsmd:
@@ -107,39 +105,38 @@ jobs:
     strategy:
       matrix:
         include:
-          - preset: "vc6"
+          # ninja preset
+          - preset: "ninja"
             tools: true
             extras: true
-          - preset: "vc6-profile"
+            configuration: "Debug"
+          - preset: "ninja"
             tools: true
             extras: true
-          - preset: "vc6-debug"
+            configuration: "Release"
+          - preset: "ninja"
             tools: true
             extras: true
-          - preset: "win32"
+            configuration: "RelWithDebInfo"
+          # ninja-vc6 preset
+          - preset: "ninja-vc6"
             tools: true
             extras: true
-          - preset: "win32-profile"
+            configuration: "Debug"
+          - preset: "ninja-vc6"
             tools: true
             extras: true
-          - preset: "win32-debug"
+            configuration: "Release"
+          - preset: "ninja-vc6"
             tools: true
             extras: true
-          # vcpkg builds have been disabled for now due to excessive build times of 30 minutes per preset
-          # - preset: "win32-vcpkg"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-profile"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-debug"
-          #   tools: true
-          #   extras: true
+            configuration: "RelWithDebInfo"
       fail-fast: false
     uses: ./.github/workflows/build-toolchain.yml
     with:
-      game: "GeneralsMD"
+      game: "Generals"
       preset: ${{ matrix.preset }}
       tools: ${{ matrix.tools }}
       extras: ${{ matrix.extras }}
+      configuration: ${{ matrix.configuration }}
     secrets: inherit