修复构建

lyswhut · Dec 29, 2023 · e48e0d5 · e48e0d5
1 parent 2996d6b
commit e48e0d5
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/.github/actions/build-packages/action.yml b/.github/actions/build-packages/action.yml
diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml
@@ -19,7 +19,12 @@ jobs:
           JAVA_VERSION: '17'
 
       - name: Build Packages
-        uses: ./.github/actions/build-packages
+        shell: bash
+        run: |
+          cd android
+          echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }}
+          ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}'
+          rm -f app/${{ secrets.KEYSTORE_STORE_FILE }}
 
       # Push tag to GitHub if package.json version's tag is not tagged
       - name: Get package version
@@ -51,7 +56,12 @@ jobs:
           JAVA_VERSION: '17'
 
       - name: Build Packages
-        uses: ./.github/actions/build-packages
+        shell: bash
+        run: |
+          cd android
+          echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }}
+          ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}'
+          rm -f app/${{ secrets.KEYSTORE_STORE_FILE }}
 
       # Push tag to GitHub if package.json version's tag is not tagged
       - name: Get package version
@@ -85,7 +95,12 @@ jobs:
           JAVA_VERSION: '11'
 
       - name: Build Packages
-        uses: ./.github/actions/build-packages
+        shell: bash
+        run: |
+          cd android
+          echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }}
+          ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}'
+          rm -f app/${{ secrets.KEYSTORE_STORE_FILE }}
 
       # Push tag to GitHub if package.json version's tag is not tagged
       - name: Get package version

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,12 @@ jobs:
           JAVA_VERSION: '17'
 
       - name: Build Packages
-        uses: ./.github/actions/build-packages
+        shell: bash
+        run: |
+          cd android
+          echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }}
+          ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}'
+          rm -f app/${{ secrets.KEYSTORE_STORE_FILE }}
 
       # Push tag to GitHub if package.json version's tag is not tagged
       - name: Get package version
@@ -59,7 +64,12 @@ jobs:
           JAVA_VERSION: '17'
 
       - name: Build Packages
-        uses: ./.github/actions/build-packages
+        shell: bash
+        run: |
+          cd android
+          echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }}
+          ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}'
+          rm -f app/${{ secrets.KEYSTORE_STORE_FILE }}
 
       # Push tag to GitHub if package.json version's tag is not tagged
       - name: Get package version
@@ -102,7 +112,12 @@ jobs:
           JAVA_VERSION: '11'
 
       - name: Build Packages
-        uses: ./.github/actions/build-packages
+        shell: bash
+        run: |
+          cd android
+          echo ${{ secrets.KEYSTORE_STORE_FILE_BASE64 }} | base64 --decode > app/${{ secrets.KEYSTORE_STORE_FILE }}
+          ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='${{ secrets.KEYSTORE_STORE_FILE }}' -PMYAPP_UPLOAD_KEY_ALIAS='${{ secrets.KEYSTORE_KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}' -PMYAPP_UPLOAD_KEY_PASSWORD='${{ secrets.KEYSTORE_KEY_PASSWORD }}'
+          rm -f app/${{ secrets.KEYSTORE_STORE_FILE }}
 
       # Push tag to GitHub if package.json version's tag is not tagged
       - name: Get package version