Merge branch '4.0-dev' into 4.0-dev

HuanCheng65 · Feb 2, 2024 · 1bccf4f · 1bccf4f
2 parents 856fedb + 66fa59a
commit 1bccf4f
Show file tree

Hide file tree

Showing 22 changed files with 857 additions and 430 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.ref_type == 'tag' }}
         run: |
           if [ -n "${{ secrets.RELEASEKEYPASSWORD }}" ]; then
-            echo ${{ secrets.KEYSTORE }} | base64 --decode > signing.jks
+            echo ${{ secrets.KEYSTORE }} | base64 --decode > ${{ vars.RELEASE_KEYSTORE }}
             echo releaseKeyAlias="${{ vars.RELEASE_KEY_ALIAS }}" >> keystore.properties
             echo releaseKeyPassword="${{ secrets.RELEASEKEYPASSWORD }}" >> keystore.properties
-            echo releaseKeyStore=$(pwd)/signing.jks >> keystore.properties
+            echo releaseKeyStore="${{ vars.RELEASE_KEYSTORE }}" >> keystore.properties
             echo releaseStorePassword="${{ secrets.RELEASESTOREPASSWORD }}" >> keystore.properties
           fi
 

diff --git a/app/build.gradle b/app/build.gradle