From 7a70607ceb657b372e2cd65e47c612a1ebd73f24 Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 15 Jul 2024 12:59:52 +0100 Subject: [PATCH] Merge pull request #45332 from Expensify/jules-androidBuildFailure [NO QA] Attempt to fix Android builds with ruby workaround (cherry picked from commit 20eb52e6b8c29dceb6851e597539d2b8fd2b3a6f) --- .github/workflows/platformDeploy.yml | 2 ++ .github/workflows/testBuild.yml | 1 + ...eact-native-community+netinfo+11.2.1+002+turbomodule.patch | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 640d1eaa1172..2b2667d587e8 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -84,6 +84,7 @@ jobs: if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} run: bundle exec fastlane android beta env: + RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} @@ -91,6 +92,7 @@ jobs: if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} run: bundle exec fastlane android production env: + RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released VERSION: ${{ env.VERSION_CODE }} - name: Archive Android sourcemaps diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index 10912aaeb436..9f6d20de4369 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -1,3 +1,4 @@ + name: Build and deploy apps for testing on: diff --git a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch index f8e171008e14..3b164672efb9 100644 --- a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch +++ b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch @@ -3062,4 +3062,8 @@ index 878f7ba..0000000 - -#Files generated by the VS build -**/Generated Files/** +<<<<<<< HEAD - +======= +- +>>>>>>> 20eb52e6 (Merge pull request #45332 from Expensify/jules-androidBuildFailure)