From 3fdb8cf17d236b0f3ec82fd39d8a35a541fb0ad9 Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Wed, 16 Aug 2023 10:35:29 -0500 Subject: [PATCH 1/4] useless change to test CI --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b453a278b29..9fd01c036cf 100644 --- a/README.md +++ b/README.md @@ -419,3 +419,4 @@ In order to compile a production iOS build, run `npm run ios-build`, this will g #### Local production build the Android app To build an APK to share run (e.g. via Slack), run `npm run android-build`, this will generate a new APK in the `android/app` folder. + \ No newline at end of file From ef97032225dd82885f1258ab09111dd6e7d418ac Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Wed, 16 Aug 2023 16:59:15 -0500 Subject: [PATCH 2/4] use debug singing config for ahdocRelease flavor --- android/app/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index d8d0c11a1a0..194e480a5c0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -138,6 +138,8 @@ android { release { signingConfig signingConfigs.release productFlavors.production.signingConfig signingConfigs.release + // AdHoc builds use the prod env, but don't need to be signed with the production keys + productFlavors.adhoc.signingConfig signingConfigs.debug minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } From 34c618cb7beaeb5f771cef7a9bee207bb545ae00 Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Thu, 17 Aug 2023 13:34:29 -0500 Subject: [PATCH 3/4] add signing key to Adhoc testflight step --- .github/workflows/testBuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index adff13b2dba..728e2da0d47 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -111,6 +111,8 @@ jobs: S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} S3_BUCKET: ad-hoc-expensify-cash S3_REGION: us-east-1 + MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} + MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} - uses: actions/upload-artifact@v3 with: From 88ebe3d697ac77b7b0e8cc0d4e911e01d0d4fdcd Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Thu, 17 Aug 2023 13:35:14 -0500 Subject: [PATCH 4/4] revert previous changes --- README.md | 3 +-- android/app/build.gradle | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 9fd01c036cf..25382161978 100644 --- a/README.md +++ b/README.md @@ -418,5 +418,4 @@ In order to compile a production desktop build, run `npm run desktop-build`, thi In order to compile a production iOS build, run `npm run ios-build`, this will generate a `Chat.ipa` in the root directory of this project. #### Local production build the Android app -To build an APK to share run (e.g. via Slack), run `npm run android-build`, this will generate a new APK in the `android/app` folder. - \ No newline at end of file +To build an APK to share run (e.g. via Slack), run `npm run android-build`, this will generate a new APK in the `android/app` folder. \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 194e480a5c0..d8d0c11a1a0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -138,8 +138,6 @@ android { release { signingConfig signingConfigs.release productFlavors.production.signingConfig signingConfigs.release - // AdHoc builds use the prod env, but don't need to be signed with the production keys - productFlavors.adhoc.signingConfig signingConfigs.debug minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" }