From 9303d2d14d6be01af67cb3d80a98a4bb30bd56ef Mon Sep 17 00:00:00 2001
From: Neo <321592+Neo-Desktop@users.noreply.github.com>
Date: Sun, 9 Jul 2023 09:52:28 -0700
Subject: [PATCH] ensure correct order of operations and proper paths

---
 .github/workflows/windows.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index cc4ef5f..a2fb6c5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -69,8 +69,8 @@ jobs:
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1
 
-      - name: Download UMSKT-DJGPP compiled artifact
-        if: ${{ matrix.arch }} == "Win32"
+      - if: ${{ matrix.arch }} == "Win32"
+        name: Download UMSKT-DJGPP compiled artifact
         uses: actions/download-artifact@v3
         with:
           name: UMSKT-DOS
@@ -78,7 +78,6 @@ jobs:
       - name: Configure UMSKT
         uses: threeal/cmake-action@v1.2.0
         with:
-          working-directory: build
           generator: "Visual Studio 17 2022"
           options: CMAKE_SYSTEM_VERSION="5.1.2600"
           args: -A ${{ matrix.msbuild-arch }} -T v141_xp ${{ matrix.cmake-args }}
@@ -90,7 +89,7 @@ jobs:
       - name: Move executable to upload directory
         run: |
           mkdir build/actions_upload
-          Move-Item build/umskt.exe build/actions_upload
+          Move-Item build/Release/umskt.exe build/actions_upload
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v3.1.2
@@ -98,15 +97,15 @@ jobs:
           name: UMSKT-${{ matrix.arch }}
           path: build/actions_upload
 
-      - name: Move Win32+DOS executable to upload directory
-        if: ${{ matrix.arch }} == "Win32"
+      - if: ${{ matrix.arch }} == "Win32"
+        name: Move Win32+DOS executable to upload directory
         run: |
           Remove-Item "build/actions_upload" -Force -Recurse
           mkdir build/actions_upload
-          Move-Item build/umskt_win32_dos.exe build/actions_upload/umskt.exe
+          Move-Item build/Release/umskt_win32_dos.exe build/actions_upload/umskt.exe
 
-      - name: Upload build artifact
-        if: ${{ matrix.arch }} == "Win32"
+      - if: ${{ matrix.arch }} == "Win32"
+        name: Upload build artifact
         uses: actions/upload-artifact@v3.1.2
         with:
           name: UMSKT-Win32+DOS