From b77d0fb47a2ff4bb640e874e35237878d5a6f328 Mon Sep 17 00:00:00 2001
From: tarsin <43900799+asuka-mio@users.noreply.github.com>
Date: Wed, 18 May 2022 14:02:02 +0800
Subject: [PATCH] Update android.yml

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6ac5c3a9a..b3bb4c3a3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,9 +1,6 @@
 name: EhViewer
 
-on: 
- push:
-    branches:
-    - master
+on: push
 
 jobs:
   linux:
@@ -11,47 +8,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
-          java-version: 1.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Build
-        env:
-          KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
-          ALIAS_NAME: ${{ secrets.ALIAS_NAME }}
-          ALIAS_PASS: ${{ secrets.ALIAS_PASS }}
+            distribution: temurin
+            java-version: 11
+      - name: Setup Android SDK Tools
+        uses: android-actions/setup-android@v2
+      - name: Install NDK
         run: |
-          ./gradlew assembleRelease
-          echo ::set-env name=APK_FILE::$(find app/build/outputs/apk -name "*.apk")
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+      - uses: gradle/gradle-build-action@v2
+      - run: |
+          git submodule update --init --recursive
+          gradle assembleRelease
+
+      - uses: actions/upload-artifact@v3
         with:
-          tag_name: 1.7.4_${{ github.run_id }}
-          release_name: 1.7.4_${{ github.run_id }}
-          body: ""
-          draft: false
-          prerelease: true
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ${{ env.APK_FILE }}
-          asset_name: app-release.apk
-          asset_content_type: application/vnd.android.package-archive
-      - uses: actions/upload-artifact@master
-        name: Upload artifact
-        with:
-          name: EhViewer
-          path: app/build/outputs/
+            name: github-${{ github.sha }}
+            path: app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk