From f7ed2c5273a8e2e1f6435acff4459f24acd0ac29 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Thu, 28 May 2026 20:33:11 +0200
Subject: [PATCH] move itch upload (#977)

---
 .github/workflows/build.yml | 49 +++++++++----------------------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3c7a4ca..2a182124 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,15 +79,6 @@ jobs:
           name: gopher64-${{ matrix.arch }}
           path: output/gopher64-${{ matrix.arch }}
           archive: false
-      - name: Setup butler
-        if: ${{ github.ref_type == 'tag' }}
-        uses: remarkablegames/setup-butler@v3
-      - name: Upload to itch.io
-        if: ${{ github.ref_type == 'tag' }}
-        run: |
-          butler push output/gopher64-${{ matrix.arch }} loganmc10/gopher64:${{ matrix.arch }} --userversion ${GITHUB_REF_NAME#v}
-        env:
-          BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
 
   build-windows:
     runs-on: ${{ matrix.os }}
@@ -161,16 +152,6 @@ jobs:
           path: output-signed/gopher64-${{ matrix.arch }}.exe
           archive: false
           overwrite: true
-      - name: Setup butler
-        if: ${{ github.ref_type == 'tag' }}
-        uses: remarkablegames/setup-butler@v3
-      - name: Upload to itch.io
-        if: ${{ github.ref_type == 'tag' }}
-        shell: bash
-        run: |
-          butler push output-signed/gopher64-${{ matrix.arch }}.exe loganmc10/gopher64:${{ matrix.arch }} --userversion ${GITHUB_REF_NAME#v}
-        env:
-          BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
 
   build-macos:
     runs-on: macos-15
@@ -237,15 +218,6 @@ jobs:
         with:
           name: gopher64-${{ matrix.arch }}
           path: target/${{ matrix.target }}/${{ env.BUILD_DIR }}/bundle/osx
-      - name: Setup butler
-        if: ${{ github.ref_type == 'tag' }}
-        uses: remarkablegames/setup-butler@v3
-      - name: Upload to itch.io
-        if: ${{ github.ref_type == 'tag' }}
-        run: |
-          butler push target/${{ matrix.target }}/${{ env.BUILD_DIR }}/bundle/osx/Gopher64.app loganmc10/gopher64:${{ matrix.arch }} --userversion ${GITHUB_REF_NAME#v}
-        env:
-          BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
 
   build-android:
     runs-on: ${{ matrix.os }}
@@ -295,15 +267,6 @@ jobs:
           name: gopher64-android
           path: android-project/output/gopher64-android.apk
           archive: false
-      - name: Setup butler
-        if: ${{ github.ref_type == 'tag' }}
-        uses: remarkablegames/setup-butler@v3
-      - name: Upload to itch.io
-        if: ${{ github.ref_type == 'tag' }}
-        run: |
-          butler push android-project/output/gopher64-android.apk loganmc10/gopher64:android --userversion ${GITHUB_REF_NAME#v}
-        env:
-          BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
 
   collect-artifacts:
     name: Collect release artifacts
@@ -323,3 +286,15 @@ jobs:
         with:
           draft: true
           files: release-artifacts/*
+      - name: Setup butler
+        uses: remarkablegames/setup-butler@v3
+      - name: Upload to itch.io
+        run: |
+          butler push release-artifacts/gopher64-linux-x86_64 loganmc10/gopher64:linux-x86_64 --userversion ${GITHUB_REF_NAME#v}
+          butler push release-artifacts/gopher64-linux-aarch64 loganmc10/gopher64:linux-aarch64 --userversion ${GITHUB_REF_NAME#v}
+          butler push release-artifacts/gopher64-windows-x86_64.exe loganmc10/gopher64:windows-x86_64 --userversion ${GITHUB_REF_NAME#v}
+          butler push release-artifacts/gopher64-windows-aarch64.exe loganmc10/gopher64:windows-aarch64 --userversion ${GITHUB_REF_NAME#v}
+          butler push release-artifacts/gopher64-macos-aarch64.zip loganmc10/gopher64:macos-aarch64 --userversion ${GITHUB_REF_NAME#v}
+          butler push release-artifacts/gopher64-android.apk loganmc10/gopher64:android --userversion ${GITHUB_REF_NAME#v}
+        env:
+          BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}