Merge pull request #45332 from Expensify/jules-androidBuildFailure

[NO QA] Attempt to fix Android builds with ruby workaround
Expensify · Jul 15, 2024 · 20eb52e · 20eb52e
2 parents 65e2f3a + c9646de
commit 20eb52e
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 92 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
@@ -2955,95 +2955,95 @@ index 878f7ba..0000000
 --- a/node_modules/@react-native-community/netinfo/windows/.npmignore
 +++ /dev/null
 @@ -1,92 +0,0 @@
--*AppPackages*
--*BundleArtifacts*
--
--#OS junk files
--[Tt]humbs.db
--*.DS_Store
--
--#Visual Studio files
--*.[Oo]bj
--*.user
--*.aps
--*.pch
--*.vspscc
--*.vssscc
--*_i.c
--*_p.c
--*.ncb
--*.suo
--*.tlb
--*.tlh
--*.bak
--*.[Cc]ache
--*.ilk
--*.log
--*.lib
--*.sbr
--*.sdf
--*.opensdf
--*.opendb
--*.unsuccessfulbuild
--ipch/
--[Oo]bj/
--[Bb]in
--[Dd]ebug*/
--[Rr]elease*/
--Ankh.NoLoad
--
--# Visual C++ cache files
--ipch/
--*.aps
--*.ncb
--*.opendb
--*.opensdf
--*.sdf
--*.cachefile
--*.VC.db
--*.VC.VC.opendb
--
--#MonoDevelop
--*.pidb
--*.userprefs
--
--#Tooling
--_ReSharper*/
--*.resharper
--[Tt]est[Rr]esult*
--*.sass-cache
--
--#Project files
--[Bb]uild/
--
--#Subversion files
--.svn
--
--# Office Temp Files
--~$*
--
--# vim Temp Files
--*~
--
--#NuGet
--packages/
--*.nupkg
--
--#ncrunch
--*ncrunch*
--*crunch*.local.xml
--
--# visual studio database projects
--*.dbmdl
--
--#Test files
--*.testsettings
--
--#Other files
--*.DotSettings
--.vs/
--*project.lock.json
--
--#Files generated by the VS build
--**/Generated Files/**
--
+-*AppPackages*
+-*BundleArtifacts*
+-
+-#OS junk files
+-[Tt]humbs.db
+-*.DS_Store
+-
+-#Visual Studio files
+-*.[Oo]bj
+-*.user
+-*.aps
+-*.pch
+-*.vspscc
+-*.vssscc
+-*_i.c
+-*_p.c
+-*.ncb
+-*.suo
+-*.tlb
+-*.tlh
+-*.bak
+-*.[Cc]ache
+-*.ilk
+-*.log
+-*.lib
+-*.sbr
+-*.sdf
+-*.opensdf
+-*.opendb
+-*.unsuccessfulbuild
+-ipch/
+-[Oo]bj/
+-[Bb]in
+-[Dd]ebug*/
+-[Rr]elease*/
+-Ankh.NoLoad
+-
+-# Visual C++ cache files
+-ipch/
+-*.aps
+-*.ncb
+-*.opendb
+-*.opensdf
+-*.sdf
+-*.cachefile
+-*.VC.db
+-*.VC.VC.opendb
+-
+-#MonoDevelop
+-*.pidb
+-*.userprefs
+-
+-#Tooling
+-_ReSharper*/
+-*.resharper
+-[Tt]est[Rr]esult*
+-*.sass-cache
+-
+-#Project files
+-[Bb]uild/
+-
+-#Subversion files
+-.svn
+-
+-# Office Temp Files
+-~$*
+-
+-# vim Temp Files
+-*~
+-
+-#NuGet
+-packages/
+-*.nupkg
+-
+-#ncrunch
+-*ncrunch*
+-*crunch*.local.xml
+-
+-# visual studio database projects
+-*.dbmdl
+-
+-#Test files
+-*.testsettings
+-
+-#Other files
+-*.DotSettings
+-.vs/
+-*project.lock.json
+-
+-#Files generated by the VS build
+-**/Generated Files/**
+-
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		name: Build and deploy apps for testing

		on:
Expand Down