From cb41cac73b5f8d4667407a09e8feea328f92207c Mon Sep 17 00:00:00 2001
From: NOURELDEEN ELSAYED <79816069+xoureldeen@users.noreply.github.com>
Date: Wed, 30 Oct 2024 03:32:20 +0300
Subject: [PATCH] Update android.yml

---
 .github/workflows/android.yml | 69 ++++++++++++-----------------------
 1 file changed, 24 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d489a5c..b0fc231 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,16 +1,14 @@
-name: Android Release Build
+name: Build and Upload Release
 
 on:
   workflow_dispatch:
     inputs:
       release_tag:
-        description: 'Release tag for the new version'
+        description: 'Release Tag'
         required: true
-        default: 'v2.9.3'
       release_notes:
-        description: 'Release notes for the new version'
+        description: 'Release Notes'
         required: true
-        default: 'Initial release'
 
 jobs:
   build:
@@ -19,37 +17,23 @@ jobs:
       - name: Check out the repository
         uses: actions/checkout@v3
 
+      - name: Ensure gradlew is executable
+        run: chmod +x gradlew
+
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '17'
 
-      - name: Chmod gradlew
-        run: chmod +x ./gradlew
-
       - name: Build Android app in release mode
-        run: ./gradlew assembleRelease
+        run: bash ./gradlew assembleRelease
 
-      - name: Upload APK
-        uses: actions/upload-artifact@v3
-        with:
-          name: app-release.apk
-          path: app/build/outputs/apk/release/app-release.apk
-
-      - name: Download vectras-vm-arm64-v8a.tar.gz
-        run: wget -O vectras-vm-arm64-v8a.tar.gz https://github.com/xoureldeen/Vectras-VM-Android/releases/download/v2.9.2/vectras-vm-arm64-v8a.tar.gz
-
-      - name: Download vectras-vm-x86_64.tar.gz
-        run: wget -O vectras-vm-x86_64.tar.gz https://github.com/xoureldeen/Vectras-VM-Android/releases/download/v2.9.2/vectras-vm-x86_64.tar.gz
-
-  release:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create a release
+      - name: Create Release
         id: create_release
         uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.event.inputs.release_tag }}
           release_name: Release ${{ github.event.inputs.release_tag }}
@@ -57,26 +41,21 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload APK to release
-        uses: actions/upload-release-asset@v1
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/release/app-release.apk
-          asset_name: app-release.apk
-          asset_content_type: application/vnd.android.package-archive
+          name: android-release-apk
+          path: app/build/outputs/apk/release/app-release.apk  # Update this path if necessary
 
-      - name: Upload vectras-vm-arm64-v8a.tar.gz to release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: vectras-vm-arm64-v8a.tar.gz
-          asset_name: vectras-vm-arm64-v8a.tar.gz
-          asset_content_type: application/gzip
+      - name: Download additional files
+        run: |
+          wget https://github.com/xoureldeen/Vectras-VM-Android/releases/download/${{ github.event.inputs.release_tag }}/vectras-vm-arm64-v8a.tar.gz
+          wget https://github.com/xoureldeen/Vectras-VM-Android/releases/download/${{ github.event.inputs.release_tag }}/vectras-vm-x86_64.tar.gz
 
-      - name: Upload vectras-vm-x86_64.tar.gz to release
-        uses: actions/upload-release-asset@v1
+      - name: Upload additional files
+        uses: actions/upload-artifact@v2
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: vectras-vm-x86_64.tar.gz
-          asset_name: vectras-vm-x86_64.tar.gz
-          asset_content_type: application/gzip
+          name: vectras-vm-files
+          path: |
+            vectras-vm-arm64-v8a.tar.gz
+            vectras-vm-x86_64.tar.gz