From d9a045bbf06f792e5196f610337dce69688b992f Mon Sep 17 00:00:00 2001
From: owo233 <callng@qq.com>
Date: Tue, 5 Dec 2023 18:26:15 +0800
Subject: [PATCH] =?UTF-8?q?`Shamrock`:=20=E4=BF=AE=E5=A4=8D=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-apk.yml | 35 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml
index cb97880..da09bf0 100644
--- a/.github/workflows/build-apk.yml
+++ b/.github/workflows/build-apk.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4.0.0
         with:
           distribution: "temurin"
           java-version: 17
@@ -30,7 +30,7 @@ jobs:
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.10.0
 
       - name: Build with Gradle
         run: |
@@ -46,42 +46,41 @@ jobs:
           KEY_ALIAS: ${{ secrets.SIGN_ALIAS }}
           KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
 
-      - name: Install aapt
-        run: sudo apt-get update && sudo apt-get install -y aapt
-
       - name: Set Shamrock Version
         run: |
-          apk_file=${{ env.APK_FILE_ALL }}
-          apk_dump=$(aapt dump badging "$apk_file")
-          version_name=$(sed -n "s/.*versionName='\([^']*\)'.*/\1/p" <<< "$apk_dump")
-          echo "SHAMROCK_VERSION=$version_name" >> $GITHUB_ENV
+          version_name_all=$(basename -s .apk "${{ env.APK_FILE_ALL }}")
+          version_name_arm64=$(basename -s .apk "${{ env.APK_FILE_ARM64 }}")
+          version_name_x86_64=$(basename -s .apk "${{ env.APK_FILE_X86_64 }}")
+          echo "SHAMROCK_VERSION_ALL=$version_name_all" >> $GITHUB_ENV
+          echo "SHAMROCK_VERSION_ARM64=$version_name_arm64" >> $GITHUB_ENV
+          echo "SHAMROCK_VERSION_x86_64=$version_name_x86_64" >> $GITHUB_ENV
 
       - name: Show Artifacts SHA256
         run: |
           echo "### Build Success :rocket:" >> $GITHUB_STEP_SUMMARY
           echo "|ABI|SHA256|" >> $GITHUB_STEP_SUMMARY
           echo "|:--------:|:----------|" >> $GITHUB_STEP_SUMMARY
-          all=($(sha256sum ${{ env.APK_FILE_ALL }}))
+          all=($(sha256sum "${{ env.APK_FILE_ALL }}"))
           echo "|all|$all" >> $GITHUB_STEP_SUMMARY
-          arm64=($(sha256sum ${{ env.APK_FILE_ARM64 }}))
+          arm64=($(sha256sum "${{ env.APK_FILE_ARM64 }}"))
           echo "|arm64|$arm64" >> $GITHUB_STEP_SUMMARY
-          x86_64=($(sha256sum ${{ env.APK_FILE_X86_64 }}))
+          x86_64=($(sha256sum "${{ env.APK_FILE_X86_64 }}"))
           echo "|x86_64|$x86_64" >> $GITHUB_STEP_SUMMARY
 
       - name: Upload ALL APK RELEASE
         uses: actions/upload-artifact@v3
         with:
-          name: Shamrock-v${{ env.SHAMROCK_VERSION }}-all
-          path: ${{ env.APK_FILE_ALL }}
+          name: "${{ env.SHAMROCK_VERSION_ALL }}"
+          path: "${{ env.APK_FILE_ALL }}"
 
       - name: Upload ARM64 APK RELEASE
         uses: actions/upload-artifact@v3
         with:
-          name: Shamrock-v${{ env.SHAMROCK_VERSION }}-arm64
-          path: ${{ env.APK_FILE_ARM64 }}
+          name: "${{ env.SHAMROCK_VERSION_ARM64 }}"
+          path: "${{ env.APK_FILE_ARM64 }}"
 
       - name: Upload X86_64 APK RELEASE
         uses: actions/upload-artifact@v3
         with:
-          name: Shamrock-v${{ env.SHAMROCK_VERSION }}-x86_64
-          path: ${{ env.APK_FILE_X86_64 }}
+          name: "${{ env.SHAMROCK_VERSION_x86_64 }}"
+          path: "${{ env.APK_FILE_X86_64 }}"