Workflow fix (#57)

* Update release.yml

* Update build_apk.yml

Author: wiiznokes

.github/workflows/build_apk.yml

@@ -58,30 +58,29 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - if: ${{ github.event.inputs.is_nightly == 'false' }}
-        name: Retrieve the secret and decode it to a file
+        name: Retrieve the secret and decode it to a file, and Build release apk
         env:
           KEY_BASE64: ${{ secrets.KEY_BASE64 }}
-        run: |
-          echo $KEY_BASE64 | base64 --decode > app/key.jks
-
-      - if: ${{ github.event.inputs.is_nightly == 'false' }}
-        name: Build apk
-        env:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           STORE_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        run: ./gradlew assembleRelease
+        run: |
+          echo $KEY_BASE64 | base64 --decode > app/key.jks
+          ./gradlew assembleRelease
+          echo "APP_VARIANT=release" >> $GITHUB_ENV
 
-      - if: ${{ github.event.inputs.is_nightly == 'true' }}
-        name: Build apk
-        run: ./gradlew assembleNightly
+      - if: ${{ (github.event.inputs.is_nightly  == 'true') || (github.event.inputs.is_nightly  == '') }}
+        name: Build nightly apk
+        run: |
+          ./gradlew assembleNightly
+          echo "APP_VARIANT=nightly" >> $GITHUB_ENV
 
       - run: |
           mkdir -p packages
 
           # warning: do not use github.event syntax here
           # https://stackoverflow.com/questions/71458189/github-action-workflow-call-does-not-use-up-to-date-input-values
-          mv app/build/outputs/apk/release/app-release.apk packages/gitnote-release-${{ inputs.version }}.apk
+          mv app/build/outputs/apk/${{ env.APP_VARIANT }}/app-release.apk packages/gitnote-${{ env.APP_VARIANT }}-${{ inputs.version }}.apk
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/release.yml

@@ -72,7 +72,7 @@ jobs:
     secrets: inherit
     with:
       version: ${{ needs.setup-env.outputs.version_name }}
-      is_nightly: ${{ github.event.inputs.is_nightly }}
+      is_nightly: ${{ inputs.is_nightly }}
 
   publish:
     needs: [build-apk, setup-env]