ci: Update workflows to match new presets

Author: aliendroid1

.github/workflows/build-toolchain.yml

@@ -80,22 +80,12 @@ jobs:
         shell: pwsh
         run: |
           # Define the base directories as local variables first
-          $VSCommonDir = "C:\VC6\VC6SP6\Common"
-          $MSDevDir = "C:\VC6\VC6SP6\Common\msdev98"
-          $MSVCDir = "C:\VC6\VC6SP6\VC98"
-          $VcOsDir = "WINNT"
-
+          $VS6_DIR = "C:\VC6\VC6SP6"
           # Set the variables in GitHub environment
-          "VSCommonDir=$VSCommonDir" >> $env:GITHUB_ENV
-          "MSDevDir=$MSDevDir" >> $env:GITHUB_ENV
-          "MSVCDir=$MSVCDir" >> $env:GITHUB_ENV
-          "VcOsDir=$VcOsDir" >> $env:GITHUB_ENV
-          "PATH=$MSDevDir\BIN;$MSVCDir\BIN;$VSCommonDir\TOOLS\$VcOsDir;$VSCommonDir\TOOLS;$env:PATH" >> $env:GITHUB_ENV
-          "INCLUDE=$MSVCDir\ATL\INCLUDE;$MSVCDir\INCLUDE;$MSVCDir\MFC\INCLUDE;$env:INCLUDE" >> $env:GITHUB_ENV
-          "LIB=$MSVCDir\LIB;$MSVCDir\MFC\LIB;$env:LIB" >> $env:GITHUB_ENV
+          "VS6_DIR=$VS6_DIR" >> $env:GITHUB_ENV
 
       - name: Set Up VC2022 Environment
-        if: startsWith(inputs.preset, 'win32')
+        if:  ${{ !startsWith(inputs.preset, 'vc6') }}
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x86
@@ -131,14 +121,9 @@ jobs:
         run: |
           $buildDir = "build\${{ inputs.preset }}"
           $artifactsDir = New-Item -ItemType Directory -Force -Path "$buildDir\${{ inputs.game }}\artifacts" -Verbose
-
-            if ("${{ inputs.preset }}" -like "win32*") {
-            # For win32 preset, look in config-specific subdirectories
-            $configToUse = if ("${{ inputs.preset }}" -match "debug") { "Debug" } else { "Release" }
-            $files = Get-ChildItem -Path "$buildDir\Core\$configToUse","$buildDir\${{ inputs.game }}\$configToUse" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
-            } else {
-            $files = Get-ChildItem -Path "$buildDir\Core","$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
-          }
+            # look in config-specific subdirectories
+            $configToUse = if ("${{ inputs.preset }}" -match "relwithdebinfo") { "RelWithDebInfo" } else { "Release" }
+            $files = Get-ChildItem -Path "$buildDir\Core\$configToUse","$buildDir\${{ inputs.game }}\$configToUse" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose         
           $files | Move-Item -Destination $artifactsDir -Verbose -Force
 
       - name: Upload ${{ inputs.game }} ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Artifact

.github/workflows/ci.yml

@@ -63,34 +63,30 @@ jobs:
     strategy:
       matrix:
         include:
-          - preset: "vc6"
+          - preset: "release"
             tools: true
             extras: true
-          - preset: "vc6-profile"
+          - preset: "relwithdebinfo"
             tools: true
             extras: true
-          - preset: "vc6-debug"
+          - preset: "dev-release"
             tools: true
             extras: true
-          - preset: "win32"
+          - preset: "dev-relwithdebinfo"
             tools: true
             extras: true
-          - preset: "win32-profile"
+          - preset: "vc6-release"
             tools: true
             extras: true
-          - preset: "win32-debug"
+          - preset: "vc6-relwithdebinfo"
+            tools: true
+            extras: true
+          - preset: "vc6-dev-release"
+            tools: true
+            extras: true
+          - preset: "vc6-dev-relwithdebinfo"
             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
     uses: ./.github/workflows/build-toolchain.yml
     with:
@@ -107,34 +103,30 @@ jobs:
     strategy:
       matrix:
         include:
-          - preset: "vc6"
+          - preset: "release"
+            tools: true
+            extras: true
+          - preset: "relwithdebinfo"
+            tools: true
+            extras: true
+          - preset: "dev-release"
             tools: true
             extras: true
-          - preset: "vc6-profile"
+          - preset: "dev-relwithdebinfo"
             tools: true
             extras: true
-          - preset: "vc6-debug"
+          - preset: "vc6-release"
             tools: true
             extras: true
-          - preset: "win32"
+          - preset: "vc6-relwithdebinfo"
             tools: true
             extras: true
-          - preset: "win32-profile"
+          - preset: "vc6-dev-release"
             tools: true
             extras: true
-          - preset: "win32-debug"
+          - preset: "vc6-dev-relwithdebinfo"
             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
     uses: ./.github/workflows/build-toolchain.yml
     with: