From 34f57943b3fe4ae5d289718a9923197d71f56b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ak=C3=ACra?=
 <166439659+slotmachinedev@users.noreply.github.com>
Date: Sun, 28 Apr 2024 20:31:54 +0000
Subject: [PATCH] Update android.yml [One of the many times I will...]

---
 .github/workflows/android.yml | 76 +++++++++++++++++++++++++----------
 1 file changed, 54 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 13abfda..6531c8d 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,26 +1,58 @@
-name: Build & Publish Release APK
+name: Build and Release
 
 on:
-  push:
-    tags:
-      - '*'
+ push:
+   branches:
+     - master
+   tags:
+     - "v*"
 
 jobs:
-  Gradle:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v2
-    - name: setup jdk
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Make Gradle executable
-      run: chmod +x ./gradlew
-    - name: Build Release APK
-      run: ./gradlew assembleRelease
-    - name: Releasing using Hub
-      uses: sangatdesai/release-apk@main
-      env:
-       GITHUB_TOKEN: ${{ secrets.TOKEN }}
-       APP_FOLDER: app
+ apk:
+   name: Generate APK
+   runs-on: ubuntu-latest
+   steps:
+     - name: Checkout
+       uses: actions/checkout@v2.4.0
+     - name: Setup JDK
+       uses: actions/setup-java@v2.5.0
+       with:
+         distribution: temurin
+         java-version: "11"
+     - name: Set execution flag for gradlew
+       run: chmod +x gradlew
+     - name: Build APK
+       run: bash ./gradlew assembleDebug --stacktrace
+     - name: Upload APK
+       uses: actions/upload-artifact@v1
+       with:
+         name: apk
+         path: app/build/outputs/apk/debug/app-debug.apk
+
+ release:
+   name: Release APK
+   needs: apk
+   runs-on: ubuntu-latest
+   steps:
+     - name: Download APK from build
+       uses: actions/download-artifact@v1
+       with:
+         name: apk
+     - name: Create Release
+       id: create_release
+       uses: actions/create-release@v1
+       env:
+         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+       with:
+         tag_name: ${{ github.run_number }}
+         release_name: ${{ github.event.repository.name }} v${{ github.run_number }}
+     - name: Upload Release APK
+       id: upload_release_asset
+       uses: actions/upload-release-asset@v1.0.1
+       env:
+         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+       with:
+         upload_url: ${{ steps.create_release.outputs.upload_url }}
+         asset_path: apk/app-debug.apk
+         asset_name: ${{ github.event.repository.name }}.apk
+         asset_content_type: application/zip