From fad6558f277e46ebb874e5209e85c633b80f1f46 Mon Sep 17 00:00:00 2001
From: Lsong <song940@gmail.com>
Date: Thu, 29 Aug 2024 16:00:47 +0800
Subject: [PATCH] update

---
 .github/workflows/android.yml | 39 ++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 228e0db..8d7d9e3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,5 +1,4 @@
 name: Android CI
-
 on:
   push:
     branches: [ "master" ]
@@ -14,41 +13,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: gradle
-    
-    - name: Cache Gradle packages
-      uses: actions/cache@v3
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
-    
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    
+
     - name: Build with Gradle
       run: ./gradlew assembleDebug
-    
-    - name: Get app version
-      run: echo "APP_VERSION=$(./gradlew -q printVersionName)" >> $GITHUB_ENV
-    
+
+    - name: Run tests
+      run: ./gradlew test
+
     - name: Set current date as env variable
       run: echo "DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
-    
+
+    - name: Get repository name
+      run: echo "REPO_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+
     - name: Rename APK
-      run: mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/MyApp-${{ env.APP_VERSION }}-debug-${{ env.DATE }}.apk
-    
+      run: |
+        mkdir -p ./artifacts
+        mv ./app/build/outputs/apk/debug/app-debug.apk ./artifacts/${{ env.REPO_NAME }}-debug-${{ env.DATE }}.apk
+
     - name: Upload Release
       uses: softprops/action-gh-release@v1
+      if: github.event_name != 'pull_request'
       with:
-        tag_name: nightly-${{ env.APP_VERSION }}-${{ env.DATE }}
-        name: Nightly Build ${{ env.APP_VERSION }} (${{ env.DATE }})
-        files: app/build/outputs/apk/debug/MyApp-${{ env.APP_VERSION }}-debug-${{ env.DATE }}.apk
+        tag_name: nightly-${{ env.DATE }}
+        name: Nightly Build ${{ env.DATE }}
+        files: ./artifacts/${{ env.REPO_NAME }}-debug-${{ env.DATE }}.apk
         draft: false
         prerelease: true
\ No newline at end of file