ensure correct order of operations and proper paths

This commit is contained in:
Neo 2023-07-09 09:52:28 -07:00
parent 69aa05a40f
commit 9303d2d14d

View File

@ -69,8 +69,8 @@ jobs:
- name: Setup MSBuild - name: Setup MSBuild
uses: microsoft/setup-msbuild@v1 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 uses: actions/download-artifact@v3
with: with:
name: UMSKT-DOS name: UMSKT-DOS
@ -78,7 +78,6 @@ jobs:
- name: Configure UMSKT - name: Configure UMSKT
uses: threeal/cmake-action@v1.2.0 uses: threeal/cmake-action@v1.2.0
with: with:
working-directory: build
generator: "Visual Studio 17 2022" generator: "Visual Studio 17 2022"
options: CMAKE_SYSTEM_VERSION="5.1.2600" options: CMAKE_SYSTEM_VERSION="5.1.2600"
args: -A ${{ matrix.msbuild-arch }} -T v141_xp ${{ matrix.cmake-args }} args: -A ${{ matrix.msbuild-arch }} -T v141_xp ${{ matrix.cmake-args }}
@ -90,7 +89,7 @@ jobs:
- name: Move executable to upload directory - name: Move executable to upload directory
run: | run: |
mkdir build/actions_upload 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 - name: Upload build artifact
uses: actions/upload-artifact@v3.1.2 uses: actions/upload-artifact@v3.1.2
@ -98,15 +97,15 @@ jobs:
name: UMSKT-${{ matrix.arch }} name: UMSKT-${{ matrix.arch }}
path: build/actions_upload 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: | run: |
Remove-Item "build/actions_upload" -Force -Recurse Remove-Item "build/actions_upload" -Force -Recurse
mkdir build/actions_upload 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 uses: actions/upload-artifact@v3.1.2
with: with:
name: UMSKT-Win32+DOS name: UMSKT-Win32+DOS