From 39d040029b1d4e83bfeb30782375a4812850f031 Mon Sep 17 00:00:00 2001 From: rory Date: Wed, 17 Apr 2024 20:39:12 -0700 Subject: [PATCH 1/2] Temporarily disable Android production deploys --- .github/workflows/platformDeploy.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index d97ea2b86269..bb850e6eda10 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -87,11 +87,12 @@ jobs: MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} - - name: Run Fastlane production - if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} - run: bundle exec fastlane android production - env: - VERSION: ${{ env.VERSION_CODE }} + # Note: Android production deploys are temporarily disabled until https://github.com/Expensify/App/issues/40108 is resolved + # - name: Run Fastlane production + # if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} + # run: bundle exec fastlane android production + # env: + # VERSION: ${{ env.VERSION_CODE }} - name: Archive Android sourcemaps uses: actions/upload-artifact@v3 @@ -158,7 +159,7 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} GCP_GEOLOCATION_API_KEY: $${{ secrets.GCP_GEOLOCATION_API_KEY_PRODUCTION }} - + - name: Build staging desktop app if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} From d5157821d418931fc2e57fccd26f09c80dfcc3e1 Mon Sep 17 00:00:00 2001 From: rory Date: Wed, 17 Apr 2024 20:57:34 -0700 Subject: [PATCH 2/2] Fix tests --- workflow_tests/mocks/platformDeployMocks.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/workflow_tests/mocks/platformDeployMocks.ts b/workflow_tests/mocks/platformDeployMocks.ts index 504510ac8962..9d5727bbf5f5 100644 --- a/workflow_tests/mocks/platformDeployMocks.ts +++ b/workflow_tests/mocks/platformDeployMocks.ts @@ -38,7 +38,6 @@ const PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK = createMockStep('Run F 'MYAPP_UPLOAD_STORE_PASSWORD', 'MYAPP_UPLOAD_KEY_PASSWORD', ]); -const PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK = createMockStep('Run Fastlane production', 'Running Fastlane production', 'ANDROID', null, ['VERSION']); const PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK = createMockStep('Archive Android sourcemaps', 'Archiving Android sourcemaps', 'ANDROID', ['name', 'path']); const PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = createMockStep( 'Upload Android version to GitHub artifacts', @@ -70,7 +69,6 @@ const PLATFORM_DEPLOY__ANDROID__STEP_MOCKS = [ PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK, PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK, PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK, - PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK, PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK, PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK, PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK,