Merge pull request #50189 from Expensify/Rory-FixAndroidDeploy

(cherry picked from commit 1c0ce65) (CP triggered by roryabraham)
Expensify · Oct 3, 2024 · 9506bab · 9506bab
1 parent 6c602c6
commit 9506bab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
@@ -83,11 +83,9 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Decrypt keystore and json key
-        run: |
-          cd android/app
-          gpg --batch --yes --decrypt --passphrase="${{ secrets.LARGE_SECRET_PASSPHRASE }}" --output my-upload-key.keystore my-upload-key.keystore.gpg
-          gpg --batch --yes --decrypt --passphrase="${{ secrets.LARGE_SECRET_PASSPHRASE }}" --output android-fastlane-json-key.json android-fastlane-json-key.json.gpg
+      - name: Decrypt keystore to sign the APK/AAB
+        run: gpg --batch --yes --decrypt --passphrase="${{ secrets.LARGE_SECRET_PASSPHRASE }}" --output my-upload-key.keystore my-upload-key.keystore.gpg
+        working-directory: android/app
 
       - name: Get package version
         id: getPackageVersion

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -102,6 +102,10 @@ jobs:
       - name: Log downloaded artifact paths
         run: ls -R /tmp/artifacts
 
+      - name: Decrypt json w/ Google Play credentials
+        run: gpg --batch --yes --decrypt --passphrase="${{ secrets.LARGE_SECRET_PASSPHRASE }}" --output android-fastlane-json-key.json android-fastlane-json-key.json.gpg
+        working-directory: android/app
+
       - name: Upload Android app to Google Play
         run: bundle exec fastlane android upload_google_play_internal
         env: