Prevent conflicting artifacts

TheTrackerCouncil · Jun 27, 2024 · d9b856a · d9b856a
1 parent e15bf35
commit d9b856a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -82,6 +82,7 @@ jobs:
         name: SMZ3CasRandomizer_${{ steps.version.outputs.number }}
   build-mac:
     runs-on: macos-latest
+    if: ${{ github.event_name != 'pull_request' }}
     steps:
     - uses: actions/checkout@v4
     - name: Download config repo
@@ -107,7 +108,6 @@ jobs:
     - name: Publish
       run: dotnet publish -r osx-arm64 --configuration Release -p:UseAppHost=true src/TrackerCouncil.Smz3.UI/TrackerCouncil.Smz3.UI.csproj
     - name: Get version number
-      if: ${{ github.event_name != 'pull_request' }}
       id: version
       run: |
         $version = (Get-Item "src\TrackerCouncil.Smz3.UI\bin\Release\net8.0\osx-arm64\publish\SMZ3CasRandomizer.dll").VersionInfo.ProductVersion
@@ -122,7 +122,6 @@ jobs:
         ./setup/package-macos-app.sh "${{ steps.version.outputs.number }}"
     - name: Upload artifact
       uses: actions/upload-artifact@v4
-      if: ${{ github.event_name != 'pull_request' }}
       with:
         path: "setup/output/*"
-        name: SMZ3CasRandomizer_${{ steps.version.outputs.number }}
+        name: SMZ3CasRandomizerMacOS_${{ steps.version.outputs.number }}
diff --git a/setup/package-macos-app.sh b/setup/package-macos-app.sh
@@ -1,6 +1,6 @@
 # Define variables
 APP_NAME="SMZ3CasRandomizer.app"
-ZIP_FILE="SMZ3CasRandomizer_$1.zip"
+ZIP_FILE="SMZ3CasRandomizerMacOS_$1.zip"
 PUBLISH_OUTPUT_DIRECTORY="src/TrackerCouncil.Smz3.UI/bin/Release/net8.0/osx-arm64/publish"
 INFO_PLIST="Info.plist"
 ICON_FILE="SMZ3.icns"