From 9506bab4fec87aa57b9244bf8f2f705cc7718166 Mon Sep 17 00:00:00 2001 From: Francois Laithier Date: Thu, 3 Oct 2024 14:11:25 -0700 Subject: [PATCH] Merge pull request #50189 from Expensify/Rory-FixAndroidDeploy (cherry picked from commit 1c0ce65247d5d0468a0452181d9f71b6a16991a9) (CP triggered by roryabraham) --- .github/workflows/buildAndroid.yml | 8 +++----- .github/workflows/deploy.yml | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml index a8023aebd359..c91a9fbc91b8 100644 --- 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 index 60bb97b0c2e7..555e7650193c 100644 --- 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: