From dc3060c91904f82051602a397d67a9ece59743c0 Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Tue, 25 Jul 2023 22:31:06 +0100
Subject: [PATCH 1/2] Update build-windows-msvc.yml

github workflow doesnt like env?
---
 .github/workflows/build-windows-msvc.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml
index 3bf7bf722..69da4e606 100644
--- a/.github/workflows/build-windows-msvc.yml
+++ b/.github/workflows/build-windows-msvc.yml
@@ -4,12 +4,7 @@ on:
         branches: [development]
     pull_request:
         branches: [development]
-env:
-    build_type: "Release"
-    cc: "cl"
-    cxx: "cl"
-    environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
-
+        
 concurrency:
     group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-windows
     cancel-in-progress: true
@@ -20,6 +15,11 @@ jobs:
         runs-on: windows-latest
         strategy:
             fail-fast: false
+            matrix:
+               build_type: "Release"
+               cc: "cl"
+               cxx: "cl"
+               environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
         steps:
             - uses: actions/checkout@v3
             - uses: ilammy/msvc-dev-cmd@v1
@@ -34,16 +34,16 @@ jobs:
             - name: Install Windows MSVC Dependencies
               run: |
                 cmake --version
-                cmd "${{env.environment_script}}"
+                cmd "${{matrix.environment_script}}"
 
             - name: Configure Build & Install
               uses: ashutoshvarma/action-cmake-build@v1
               with:
                 build-dir: ${{github.workspace}}/build
                 # will set the CC & CXX for cmake
-                cc: ${{env.cc}}
-                cxx: ${{env.cxx}}
-                build-type: ${{env.build_type}} 
+                cc: ${{matrix.cc}}
+                cxx: ${{matrix.cxx}}
+                build-type: ${{matrix.build_type}}
                 # Extra options pass to cmake while configuring project
                 configure-options: -DTORQUE_APP_NAME=Torque3D -DTORQUE_TESTING=ON
                 # install the build using cmake --install
@@ -60,4 +60,4 @@ jobs:
             - name: Upload Artifact
               uses: ./.github/actions/upload-artifact
               with:
-                name: torque3dWindowsMSVCUnitTest
\ No newline at end of file
+                name: torque3dWindowsMSVCUnitTest

From 3b799353cd35d7a02645adc250e3b9732108ae90 Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Tue, 25 Jul 2023 22:34:24 +0100
Subject: [PATCH 2/2] Update build-windows-msvc.yml

---
 .github/workflows/build-windows-msvc.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml
index 69da4e606..453654861 100644
--- a/.github/workflows/build-windows-msvc.yml
+++ b/.github/workflows/build-windows-msvc.yml
@@ -15,11 +15,6 @@ jobs:
         runs-on: windows-latest
         strategy:
             fail-fast: false
-            matrix:
-               build_type: "Release"
-               cc: "cl"
-               cxx: "cl"
-               environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
         steps:
             - uses: actions/checkout@v3
             - uses: ilammy/msvc-dev-cmd@v1
@@ -34,16 +29,16 @@ jobs:
             - name: Install Windows MSVC Dependencies
               run: |
                 cmake --version
-                cmd "${{matrix.environment_script}}"
+                cmd "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
 
             - name: Configure Build & Install
               uses: ashutoshvarma/action-cmake-build@v1
               with:
                 build-dir: ${{github.workspace}}/build
                 # will set the CC & CXX for cmake
-                cc: ${{matrix.cc}}
-                cxx: ${{matrix.cxx}}
-                build-type: ${{matrix.build_type}}
+                cc: "cl"
+                cxx: "cl"
+                build-type: "Release"
                 # Extra options pass to cmake while configuring project
                 configure-options: -DTORQUE_APP_NAME=Torque3D -DTORQUE_TESTING=ON
                 # install the build using cmake --install