Skip to content

[No QA] Simplify hybrid and standalone setup #60494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
86e8424
Introduce IS_HYBRID env
mateuuszzzzz Apr 18, 2025
fa6158a
Simplify envs passing during builds
mateuuszzzzz Apr 18, 2025
cfc35b7
Remove redundant lines
mateuuszzzzz Apr 18, 2025
3d0fb71
Remove verbose flag
mateuuszzzzz Apr 18, 2025
374a2ca
Update Podfile.lock
mateuuszzzzz Apr 18, 2025
5b7d1f5
Update submodule PR
mateuuszzzzz Apr 18, 2025
db1824c
Bump rnef
mateuuszzzzz Apr 18, 2025
1bf040d
Upgrade cli-config-android
mateuuszzzzz Apr 18, 2025
7a90b4c
Fix conflict
mateuuszzzzz Apr 18, 2025
fc3e9b2
Update paths in rnef and react-native configs
mateuuszzzzz Apr 22, 2025
9b07905
Change submodule commit
mateuuszzzzz Apr 22, 2025
83f7be3
Merge branch 'main' into simplify-hybrid-and-standalone-setup
mateuuszzzzz Apr 22, 2025
0300fc7
Update rnef package
mateuuszzzzz Apr 22, 2025
83cd0c5
Bring back root parameter
mateuuszzzzz Apr 23, 2025
23bb38b
Fix paths
mateuuszzzzz Apr 23, 2025
578b55e
Change submodule commit
mateuuszzzzz Apr 23, 2025
53eeb88
Add trailing slash
mateuuszzzzz Apr 23, 2025
ec080cf
Pick correct build
mateuuszzzzz Apr 23, 2025
2251b77
Pick correct build in run-build.sh
mateuuszzzzz Apr 23, 2025
1bfd237
Merge branch 'main' into simplify-hybrid-and-standalone-setup
mateuuszzzzz Apr 23, 2025
53d4e43
Use Podfile.lock from main
mateuuszzzzz Apr 23, 2025
9451d18
Bump RNEF and update configs
mateuuszzzzz Apr 24, 2025
2f53a7a
Update submodule commit
mateuuszzzzz Apr 24, 2025
fd04677
Merge branch 'main' into simplify-hybrid-and-standalone-setup
mateuuszzzzz Apr 25, 2025
20cc0b7
Fix Verify Podfile check
mateuuszzzzz Apr 25, 2025
6bf16cd
Fix indentation
mateuuszzzzz Apr 28, 2025
ad2a68c
Fix indentation
mateuuszzzzz Apr 28, 2025
fe9ef06
Simplify IS_HYBRID_APP env
mateuuszzzzz Apr 28, 2025
1e841e7
Explictly set is_hybrid_build to false
mateuuszzzzz Apr 28, 2025
49439b0
Merge branch 'main' into simplify-hybrid-and-standalone-setup
mateuuszzzzz Apr 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/remote-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ jobs:
fail-fast: false
matrix:
include:
- project_root: ./
variant: 'developmentDebug'
- variant: 'developmentDebug'

- project_root: Mobile-Expensify/
is_hybrid_build: true
variant: 'Debug'
- variant: 'Debug'
is_hybrid_build: true
steps:
- name: Checkout
# v4
Expand All @@ -36,7 +34,7 @@ jobs:
- name: RNEF Remote Build - Android
uses: callstackincubator/android@333f590005be752c28f07e36fa7151be3b2e18da
env:
PROJECT_ROOT_PATH: ${{ matrix.project_root }}
IS_HYBRID_APP: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
with:
variant: ${{ matrix.variant }}
github-token: ${{ github.token }}
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/remote-build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ jobs:
fail-fast: false
matrix:
include:
- project_root: ./
scheme: 'New Expensify Dev'
configuration: 'DebugDevelopment'
- scheme: 'New Expensify Dev'
configuration: 'DebugDevelopment'

- project_root: Mobile-Expensify/
is_hybrid_build: true
scheme: 'Expensify Dev'
configuration: 'Debug'
- scheme: 'Expensify Dev'
configuration: 'Debug'
is_hybrid_build: true
steps:
- name: Checkout
# v4
Expand All @@ -40,7 +38,7 @@ jobs:
- name: RNEF Remote Build - iOS
uses: callstackincubator/ios@f8aeffabe13be32e9aa69b86726de67bff5a694e
env:
PROJECT_ROOT_PATH: ${{ matrix.project_root }}
IS_HYBRID_APP: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
with:
destination: simulator
scheme: ${{ matrix.scheme }}
Expand Down
1 change: 0 additions & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ require File.join(File.dirname(`node --print "require.resolve('expo/package.json
# This value is used by $RNMapboxMaps
$RNMapboxMapsImpl = 'mapbox'
$VCDisableFrameProcessors = true
ENV['PROJECT_ROOT_PATH'] = "./";

def node_require(script)
# Resolve script with node to allow for hoisting
Expand Down
48 changes: 6 additions & 42 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -416,7 +415,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -433,7 +431,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -452,7 +449,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -470,7 +466,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -488,7 +483,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -506,7 +500,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -524,7 +517,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -542,7 +534,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -560,7 +551,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -578,7 +568,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -596,7 +585,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -614,7 +602,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand All @@ -632,7 +619,6 @@ PODS:
- React-jsiexecutor
- React-jsinspector
- React-perflogger
- React-rendererconsistency
- React-runtimescheduler
- React-utils
- SocketRocket (= 0.7.1)
Expand Down Expand Up @@ -707,7 +693,6 @@ PODS:
- React-Fabric/componentregistry (= 0.77.1)
- React-Fabric/componentregistrynative (= 0.77.1)
- React-Fabric/components (= 0.77.1)
- React-Fabric/consistency (= 0.77.1)
- React-Fabric/core (= 0.77.1)
- React-Fabric/dom (= 0.77.1)
- React-Fabric/imagemanager (= 0.77.1)
Expand Down Expand Up @@ -899,27 +884,6 @@ PODS:
- React-utils
- ReactCommon/turbomodule/core
- Yoga
- React-Fabric/consistency (0.77.1):
- DoubleConversion
- fast_float (= 6.1.4)
- fmt (= 11.0.2)
- glog
- hermes-engine
- RCT-Folly/Fabric (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-cxxreact
- React-debug
- React-featureflags
- React-graphics
- React-jsi
- React-jsiexecutor
- React-logger
- React-rendererdebug
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- React-Fabric/core (0.77.1):
- DoubleConversion
- fast_float (= 6.1.4)
Expand Down Expand Up @@ -3381,7 +3345,7 @@ SPEC CHECKSUMS:
AirshipServiceExtension: 9c73369f426396d9fb9ff222d86d842fac76ba46
AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
boost: 659a89341ea4ab3df8259733813b52f26d8be9a5
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
EXAV: 57ea461614a714b8b8fcc72c6fbc298b8f1ec78b
EXImageLoader: 759063a65ab016b836f73972d3bb25404888713d
Expand Down Expand Up @@ -3440,13 +3404,13 @@ SPEC CHECKSUMS:
RCTTypeSafety: 031cefa254a1df313a196f105b8fcffdab1c5ab6
React: 8edfc46c315852ec88ea4a29d5e79019af3dc667
React-callinvoker: 4450b01574dfc7a8f074f7e29e6965ac04859c8f
React-Core: 0ac3acde025b10da5ccb9970547ab60a863654ce
React-Core: 13bdd0a0125fdaecdee747b62e02d2a65b026520
React-CoreModules: ebe93fa403bbd4d0909de105ffd34eeaad355083
React-cxxreact: af8a2be3edfed0e1168279eea443f95a7285602e
React-debug: b0f7271aeacc2eb9e34f863397dcfc204ef721c0
React-defaultsnativemodule: 2ad21fff895dabfb7db60ee1c37d0a3866229430
React-domnativemodule: f788e7169988a61ac38a5fc493ac02b5fbda7d6b
React-Fabric: 012ec12475cf941575871fdc006cf934090a9840
React-Fabric: 8b404451db2bb07bcf0e3f6dfebfb26455e4d7ce
React-FabricComponents: 40cecebced128b2aa50c25a5fa6fdcd3b175286d
React-FabricImage: 81787fa643b67f1327b4aa5fa1678dc73a771e34
React-featureflags: 23d3dcdac6c9badeeb631db8a0883c7a3108d580
Expand Down Expand Up @@ -3489,7 +3453,7 @@ SPEC CHECKSUMS:
react-native-webview: b375842af66a9f0ab979378bdc8b26eeb5d8e3ee
React-nativeconfig: cb207ebba7cafce30657c7ad9f1587a8f32e4564
React-NativeModulesApple: 82a8bee52df9f5b378195a500f22be3a6ef0f890
React-perflogger: a8a27aa65a47f740eff65bb38b79baacb38a50d5
React-perflogger: 8152bab3f0eb4b8751f282f9af7caed2c823a9ea
React-performancetimeline: 3ef4a640b56f9c7ec5f52bd93217b9b607c37cf4
React-RCTActionSheet: 0fdf55fb8724856d63ca8c63cdb4e2325e15e8ec
React-RCTAnimation: b93f5a1675cc2599e96851fec13c909fdfb1d6bb
Expand All @@ -3503,7 +3467,7 @@ SPEC CHECKSUMS:
React-RCTSettings: 433c9f6a070bcecbe5a44d5009326b4d6f3b0667
React-RCTText: 46249950f8d8738b90a60883d19b5bef09f0a296
React-RCTVibration: 8f41e85ab6d40c7db6111ca9e8c7492c8de374fb
React-rendererconsistency: d59654ad59217708509d1bb6373358be321613a4
React-rendererconsistency: c766ce7261ab6ed6be7bc155c403e29436d4f156
React-rendererdebug: 1f619b295f346242842f3accee23e8394b995d3c
React-rncore: cafe45e14d870bbecbbf4bd89e12ef3b596e1f2d
React-RuntimeApple: 7f27fb75a37e00a8e1efaa6e8f7a5b653871fb1b
Expand Down Expand Up @@ -3549,6 +3513,6 @@ SPEC CHECKSUMS:
VisionCamera: c95a8ad535f527562be1fb05fb2fd324578e769c
Yoga: 1fd059161b449018342943b095a6d4e69bcaa719

PODFILE CHECKSUM: 7c82525cf111fba4b673ad07e55f2994ea241a32
PODFILE CHECKSUM: 3742d104d6ece80a980e5052f676b69f97405c55

COCOAPODS: 1.15.2
Loading
Loading