Merge pull request #45332 from Expensify/jules-androidBuildFailure

[NO QA] Attempt to fix Android builds with ruby workaround (cherry picked from commit 20eb52e)
Expensify · Jul 15, 2024 · 7a70607 · 7a70607
1 parent 1e11d06
commit 7a70607
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -84,13 +84,15 @@ 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 }}
 
       - name: Run Fastlane production
         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
@@ -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
@@ -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)
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		name: Build and deploy apps for testing

		on:
Expand Down