From 782377408bf16231ecf798db7b3367c3b9a6a2aa Mon Sep 17 00:00:00 2001
From: cmclark00 <cmclark00@gmail.com>
Date: Thu, 20 Mar 2025 15:25:27 -0400
Subject: [PATCH] Update GitHub workflow to customize APK filename with
 TetriStats name and version

---
 .github/workflows/build.yml | 42 +++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb2a1b4..822d476 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,21 +29,41 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build Release APK
-        run: ./gradlew assembleRelease
-
-      - name: Upload APK as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-release
-          path: app/build/outputs/apk/release/app-release-unsigned.apk
-      
       - name: Get version name from build.gradle
         id: version
         run: |
           VERSION_NAME=$(grep -o 'versionName = "[^"]*' app/build.gradle.kts | cut -d'"' -f2)
           echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV
           echo "APP_VERSION=$VERSION_NAME" >> $GITHUB_OUTPUT
+
+      - name: Build Release APK
+        run: ./gradlew assembleRelease
+
+      - name: Rename APK for tag release
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          mkdir -p renamed_apk
+          cp app/build/outputs/apk/release/app-release-unsigned.apk renamed_apk/TetriStats-${{ env.VERSION_NAME }}.apk
+
+      - name: Rename APK for push release
+        if: ${{ !startsWith(github.ref, 'refs/tags/') && github.event_name == 'push' }}
+        run: |
+          mkdir -p renamed_apk
+          cp app/build/outputs/apk/release/app-release-unsigned.apk renamed_apk/TetriStats-${{ env.VERSION_NAME }}-${{ github.run_number }}.apk
+
+      - name: Upload APK as artifact for tag release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/upload-artifact@v4
+        with:
+          name: TetriStats-${{ env.VERSION_NAME }}
+          path: renamed_apk/TetriStats-${{ env.VERSION_NAME }}.apk
+      
+      - name: Upload APK as artifact for push release
+        if: ${{ !startsWith(github.ref, 'refs/tags/') && github.event_name == 'push' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: TetriStats-${{ env.VERSION_NAME }}-${{ github.run_number }}
+          path: renamed_apk/TetriStats-${{ env.VERSION_NAME }}-${{ github.run_number }}.apk
       
       - name: Create Release
         id: create_release
@@ -53,7 +73,7 @@ jobs:
           name: Release ${{ env.VERSION_NAME }}
           draft: false
           prerelease: false
-          files: app/build/outputs/apk/release/app-release-unsigned.apk
+          files: renamed_apk/TetriStats-${{ env.VERSION_NAME }}.apk
           body: |
             TetriStats Android App Release v${{ env.VERSION_NAME }}
             
@@ -70,7 +90,7 @@ jobs:
           name: Release v${{ env.VERSION_NAME }}-${{ github.run_number }}
           draft: false
           prerelease: false
-          files: app/build/outputs/apk/release/app-release-unsigned.apk
+          files: renamed_apk/TetriStats-${{ env.VERSION_NAME }}-${{ github.run_number }}.apk
           body: |
             TetriStats Android App Release v${{ env.VERSION_NAME }}-${{ github.run_number }}