From d5c24a037066a9fb9115f778345242f1c3b57472 Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Sun, 6 Nov 2022 23:07:41 +0400
Subject: build.yaml

---
 .github/workflows/build.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8211b09..4398d52 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,7 +41,7 @@ jobs:
         path: ${{ env.OUTPUT_DIR }}
     - name: Clean
       run: >-
-           rm ${{ env.TOOLS_DIR }}/*
+           rm ${{ env.TOOLS_DIR }}/* &&
            make -C tools_sources/nesasm/source clean
     - name: Build NesTiler for Linux-ARM32
       run: dotnet publish tools_sources/NesTiler/NesTiler -c Release -r linux-arm --no-self-contained -o ${{ env.TOOLS_DIR }}
@@ -54,7 +54,7 @@ jobs:
         path: ${{ env.OUTPUT_DIR }}
     - name: Clean
       run: >-
-           rm ${{ env.TOOLS_DIR }}/*
+           rm ${{ env.TOOLS_DIR }}/* &&
            make -C tools_sources/nesasm/source clean
     - name: Build NesTiler for Linux-ARM64
       run: dotnet publish tools_sources/NesTiler/NesTiler -c Release -r linux-arm64 --no-self-contained -o ${{ env.TOOLS_DIR }}
@@ -88,17 +88,20 @@ jobs:
            mkdir -p ${{ env.OUTPUT_DIR }} &&
            cp -fR *.asm Makefile LICENSE README.md configs spec demos games homebrew output 
     - name: Build NesTiler for MacOS-x64
-      run: dotnet publish tools_sources/NesTiler/NesTiler -c Release -r mac-x64 --no-self-contained -o ${{ env.TOOLS_DIR }}
+      run: dotnet publish tools_sources/NesTiler/NesTiler -c Release -r osx-x64 --no-self-contained -o ${{ env.TOOLS_DIR }}
     - name: Build nesasm for MacOS-x64
       run: make -C tools_sources/nesasm/source EXEDIR=../../../${{ env.TOOLS_DIR }}
     - name: Upload artifact for MacOS-x64
       uses: actions/upload-artifact@v3
       with:
-        name: ${{ env.APP_NAME }}-macos-x64
+        name: ${{ env.APP_NAME }}-osx-x64
         path: ${{ env.OUTPUT_DIR }}
 
   build-windows:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
     env:
       APP_NAME: coolgirl-multirom-builder
       OUTPUT_DIR: output
-- 
cgit v1.2.3