From 12e14bdac4b22ed492e4c0fc1ce4a4b97f498105 Mon Sep 17 00:00:00 2001
From: LebJe <51171427+LebJe@users.noreply.github.com>
Date: Mon, 1 Jan 2024 18:07:50 -0500
Subject: [PATCH] N

---
 .github/workflows/buildAndTest-Windows.yml | 28 +++++++---------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/buildAndTest-Windows.yml b/.github/workflows/buildAndTest-Windows.yml
index ddac2c2..a369caf 100644
--- a/.github/workflows/buildAndTest-Windows.yml
+++ b/.github/workflows/buildAndTest-Windows.yml
@@ -24,6 +24,12 @@ jobs:
               uses: "e-t-l/setup-mingw@patch-1"
               with:
                   platform: "x64"
+            - name: "Set up MSVC"
+              if: "${{ matrix.compiler == 'MSVC' }}"
+              uses: "ompnerd/gha-setup-vsdevenv@main"
+              # uses: "TheMrMilchmann/setup-msvc-dev@v3"
+              # with:
+              #   arch: x64
             - name: "Configure Project"
               run: |
                   New-Item -Path "LuaRocks\tree\luaRocksConfig.lua" -ItemType File
@@ -32,44 +38,26 @@ jobs:
                   $env:LUAROCKS_LUADIR=$(Resolve-Path LuaJIT\)
                   $env:LUAROCKS_CONFIG="$(Resolve-Path LuaRocks\tree\luaRocksConfig.lua)"
 
-                  #LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUA_LIBDIR" "$(Resolve-Path LuaJIT\bin)"
-
                   if (("${{ matrix.compiler }}" -eq "MinGW")) {
                     LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config variables.LINK_FLAGS "$(Resolve-Path LuaJIT\bin\lua51.dll)"
                   }
 
                   if (("${{ matrix.compiler }}" -eq "MSVC")) {
                     Copy-Item "$(Resolve-Path libs\lua51.lib)" -Destination "$(Resolve-Path LuaJIT\bin)"
+                    
                     LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUA_LIBDIR" "$(Resolve-Path LuaJIT\bin\)"
                     #LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUALIB" "lua51.lib"
                     LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config cmake_generator "Visual Studio 17 2022"
                   } else {
+                    LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUA_LIBDIR" "$(Resolve-Path LuaJIT\bin)"
                     LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config cmake_generator "Ninja Multi-Config"
                   }
-                  
-                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)"
-                  
-                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config
-                  
-                  Get-Content LuaRocks\tree\luaRocksConfig.lua
-            - name: "Set up MSVC"
-              if: "${{ matrix.compiler == 'MSVC' }}"
-              uses: "TheMrMilchmann/setup-msvc-dev@v3"
-              with:
-                arch: x64
             - name: "Build Project"
               run: |
                   $env:LUAROCKS_TREE=$(Resolve-Path LuaRocks\tree)
                   $env:LUAROCKS_LUADIR=$(Resolve-Path LuaJIT\)
                   $env:LUAROCKS_CONFIG="$(Resolve-Path LuaRocks\tree\luaRocksConfig.lua)"
                   
-                  Get-Content LuaRocks\tree\luaRocksConfig.lua
-                  
-                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUA_LIBDIR" "$(Resolve-Path LuaJIT\bin\)"
-                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config "variables.LUALIB" "lua51.lib"
-                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)"
-                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config
-                  Get-Content LuaRocks\tree\luaRocksConfig.lua
                   LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" make
             - name: "Run Tests"
               run: |