From b1583f947a84ae887f920b308e323006ec59cfda Mon Sep 17 00:00:00 2001
From: LikeJson <likejson@gmail.com>
Date: Tue, 22 Jun 2021 19:23:58 +0800
Subject: [PATCH] fix: CI

---
 .github/workflows/main.yml | 43 ++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7cba3f..782df16 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,6 +26,16 @@ jobs:
         with:
           java-version: '11'
 
+      - name: Write key
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+        run: |
+          echo storePassword='${{ secrets.KEY_STORE_PASSWORD }}' >> local.properties
+          echo keyAlias='${{ secrets.ALIAS }}' >> local.properties
+          echo keyPassword='${{ secrets.ALIAS_KEY_PASSWORD }}' >> local.properties
+          echo fileDir='../key.jks' >> local.properties
+          echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks
+          
+
       - name: Cache Gradle
         uses: actions/cache@v2
         with:
@@ -47,15 +57,6 @@ jobs:
       - name: Replace android-hidden-api android.jar
         run: bash ./replace_android_hidden_api_jar.sh
 
-      - name: Write key
-          if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
-          run: |
-            echo storePassword='${{ secrets.KEY_STORE_PASSWORD }}' >> local.properties
-            echo keyAlias='${{ secrets.ALIAS }}' >> local.properties
-            echo keyPassword='${{ secrets.ALIAS_KEY_PASSWORD }}' >> local.properties
-            echo fileDir='../key.jks' >> local.properties
-            echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks
-
       - name: Build Release
         id: buildRelease
         run: |
@@ -69,17 +70,19 @@ jobs:
         with:
           name: "${{ steps.buildRelease.outputs.releaseName }}"
           path: "app/release/signed/*.apk"
-            - name: Upload apk
-              if: success()
-              uses: actions/upload-artifact@v2
-              with:
-                name: ${{ steps.buildRelease.outputs.releaseName }}
-                path: "app/build/outputs/apk/release/*.apk"
-            - name: Upload mappings
-              uses: actions/upload-artifact@v2
-              with:
-                name: ${{ steps.buildRelease.outputs.releaseName }}-mappings
-                path: "app/build/outputs"
+            
+      - name: Upload apk
+        if: success()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.buildRelease.outputs.releaseName }}
+          path: "app/build/outputs/apk/release/*.apk"
+      
+      - name: Upload mappings
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.buildRelease.outputs.releaseName }}-mappings
+          path: "app/build/outputs"
           
       - name: Post to channel
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'