From cb0483d53b45192eb29bc9a3dcc3c497c7d29220 Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Wed, 9 Apr 2025 14:45:36 +0200 Subject: [PATCH 1/8] Bump react navigation --- FabricExample/ios/Podfile.lock | 106 ++++++++++++++++----------------- react-navigation | 2 +- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock index 69ffe3335e..24c79f8248 100644 --- a/FabricExample/ios/Podfile.lock +++ b/FabricExample/ios/Podfile.lock @@ -2013,72 +2013,72 @@ SPEC CHECKSUMS: fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8 hermes-engine: f185bc10472e612edc743be4355bf46bad800446 - RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809 + RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82 RCTDeprecation: 2c8856d4e9b0ba79f3e37079bd90aa0971353a1b RCTRequired: 48708ac722594441cf535d4815275c11149a1e75 RCTTypeSafety: e0c05b269c20da6febb9c80ae50ac4a815cca00a React: c1773c9d8bc6451f1b00ee11d9bd0bdf7b54a7e2 React-callinvoker: 245546c9de42c6f5fa7c9262289d8fb7ab2f735a - React-Core: 10fc423129324980e0c6949b1fc442f8a746496e - React-CoreModules: 922575c1b919ef68dbab2761db90afdd585257a5 - React-cxxreact: 07ceb4a53f352d0836373fbe866cadeb95b67222 + React-Core: 67ea7c88b0e73c2321cbf9cd6f76b26ee291d3f8 + React-CoreModules: 8a8737a847fa832881cdb2e9d14b327ea8fa77f3 + React-cxxreact: 42ff2a3e508d749689536ba39a7040b9cf965690 React-debug: c6270aaf1c7220150ac7f02143ef1d728f818732 - React-defaultsnativemodule: 6527d6c458e39142faed0615f9db44f3e28a1181 - React-domnativemodule: 40e893d9c72c5380f57ad562fbf665bc3a237359 - React-Fabric: 75d054645f8b82a3d883cb6e434361a8568f40c6 - React-FabricComponents: 87b8467879ea160f58dbaee3bbd1d968cf53dd6d - React-FabricImage: 763ec9a65f6a0009fda55e9811e9c39d091e2f76 + React-defaultsnativemodule: b87f958802b7813152ffa8c873e0c20ea55edc24 + React-domnativemodule: d190ecf40907bc0377be3fc4b84d79eefcd7995b + React-Fabric: ecbdc9b5e5f3ac62103a5c9bd1430cdbbcd8edfd + React-FabricComponents: 713d885749f3ef8692ff134524477b7848b3c742 + React-FabricImage: 5aad10fb4a821c7accd8ef249214bc7d1ae5746f React-featureflags: 403f925f7f8a43071d203eb1bd0b582ccd9b601d - React-featureflagsnativemodule: 9db6380bd1957a79b8d45d55e6acadf8ec065419 - React-graphics: 483c5b5308fafd1510fcc4a4ddf989ffee9b58de - React-hermes: 4da67646484805735f254b674e24046e1f39781c - React-idlecallbacksnativemodule: fcc79b33619a72ea3293dcc90a36368c9ecd0a52 - React-ImageManager: e6d7843c470838ed8a6f3b74f3a2111143010489 - React-jserrorhandler: 687e6800ad2375e952ed54f5361552846ff882fa - React-jsi: f5a54adbaebcaefc8b26d73524340daf0c9ebe03 - React-jsiexecutor: 4073f480ba56ca44b28e8e3c843c2ff874795514 - React-jsinspector: 2a5b8161cb374e9d1196d81668baf0568b61377a - React-jsinspectortracing: e9108a890ec559a2673c58b21fbc0db080608c05 - React-jsitracing: c783b4c25cb3f8c2790713ea2def82e5aa42820a - React-logger: b414e4fcd3be78ed0b78645f07a057c26ed18888 - React-Mapbuffer: 2765656df475f7aaa0b5bf4856aa8201380dce16 - React-microtasksnativemodule: e39619e9d06c31ca3a92628ee9b70491b9662e58 - react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162 - react-native-safe-area-context: 9c33120e9eac7741a5364cc2d9f74665049b76b3 - React-NativeModulesApple: 5b12971faa02f3ce82731c9c5deba659d83e1f4b - React-perflogger: 85ea5a47f97143ec3140c19c38eaa9168bbfe6c1 - React-performancetimeline: 34e73c0da8e6ad855218cfec7db0a5c2834466b2 + React-featureflagsnativemodule: a7ea02436d18ad0c0bf531d8f566194713ad5d69 + React-graphics: 3547cdbb5c10d8610dad27579caad6c4c761fbea + React-hermes: d4d2490df576400ba44265bfb443dcc1b9b7c7c3 + React-idlecallbacksnativemodule: 0f004e45424972c8313d8af962ce5b8732352e2f + React-ImageManager: 1abcacc5d4d1ba98231434b6eeaae543b6f7f075 + React-jserrorhandler: 3d25cd7251c85515365628d878bc2a4f07444374 + React-jsi: a7d7c45e28039a4817c1b80d1f8302f35c20e3ed + React-jsiexecutor: 0def615a82aa42001d03f7a95ea28d5ecc117726 + React-jsinspector: 39628b5cc680b3cab3c631de0e3ad07a43556594 + React-jsinspectortracing: db9800afd9cb0ee33c2253f234574b3d68d97d2a + React-jsitracing: 595ccbe6ac256aaa1fbc22efbf0fc2474244d575 + React-logger: 417a59476b6d8f7c00ffc7d0fec4964a91c7617e + React-Mapbuffer: 7df58125cd83062b50f90fa3f656e9509f1fa21c + React-microtasksnativemodule: 00924a9b4b311aec4d9d8c38de9217f88a92f1de + react-native-restart: 0bc732f4461709022a742bb29bcccf6bbc5b4863 + react-native-safe-area-context: 7e513d737b0b5c1d10bbe0e5fcc9f925a7be144c + React-NativeModulesApple: 814c1f7b25e0ce6343ffc6d0d9cf0a1c11f486c6 + React-perflogger: e3e2eb3b206f1d6375ad673b2d10bf57836f436e + React-performancetimeline: eba3e7710a19759c7a1d6aced3abe23bdc196460 React-RCTActionSheet: c32efd32f661f888acf55edf30d742d80386ab4f - React-RCTAnimation: e8ec262e00d3eb8f0bed786f720b01b035961cec - React-RCTAppDelegate: d9a2b2610a582fe7099087cd69ac455d837be9c5 - React-RCTBlob: 846c0e2ec3da1cc5da03a1d94dde794e445ce8c1 - React-RCTFabric: 05392addbc532b6f3410ba914d2252f9c629affb - React-RCTFBReactNativeSpec: db8ccb471152b3cee8c7abeaf6f524ba2bd75fc1 - React-RCTImage: 6abbb45d7f6025cd1e5180928d24322fd1885a9f - React-RCTLinking: 5cca7087d943d24269bf232f63af9fa1746eeb09 - React-RCTNetwork: 2fad4baf76e21afd4ddb2316ac5d1390f219efbe - React-RCTSettings: f472baca4e986546314ca4a867769eaf3089a6b9 - React-RCTText: 5a5917ec9bcff3ded118b7fcd198cdde38bb8232 - React-RCTVibration: ce0d94d094d67a7ee869041592fa194ff93eb585 + React-RCTAnimation: b89a2d8cc791f0996203ea647878589de6efb451 + React-RCTAppDelegate: 685b1a2a562cde000dc600fdda2130559eb73222 + React-RCTBlob: f3726c35ecc2bba9eec112f8d52a5d0433a715e6 + React-RCTFabric: ae366e8bf743818885b4a5e45b9b8887f78e3856 + React-RCTFBReactNativeSpec: c92e9905558befec8e03c1f223de10430cb7b372 + React-RCTImage: 15ca3faf7ec989826fbd62c89b85fb9fb5cdd10c + React-RCTLinking: 02c7ac32777cea3170c74bc8324184323b12d592 + React-RCTNetwork: 78628d76c2ae2eb2b5cc1a6dfbec285ccdbdb9c8 + React-RCTSettings: 2062ce9b6e69b3686c3591551ed4024c488cf96a + React-RCTText: cc059835349d468d8d93e82da6c9aa9c6032ad56 + React-RCTVibration: a9219f8da44afc58f3b291bd6798b700153a8e10 React-rendererconsistency: bb3a3c5730ab4e6a8a9ee0ffb3cb84d727c3bed5 - React-rendererdebug: 0ce779179199216814ee1368951b9c3c0b183595 + React-rendererdebug: d5a6fecae88c29fc336379489e00d0f3e60e98ef React-rncore: 03e107717ccd4ac9d5d79196681faa740ede0b9f - React-RuntimeApple: ec335c65a192e3b09ca322582a8cb311f74119d2 - React-RuntimeCore: 8bb00314545f6c1173f7b4c6c0e0a6c74bcb5c8e + React-RuntimeApple: 876f41dc76bb6b6e738f6d3ad7ea3d89e535efa8 + React-RuntimeCore: c491a1a2eb734765d6e02618f5f2a28e2872f751 React-runtimeexecutor: a13bd44f6168899cdf60682f137a09516cd5ea35 - React-RuntimeHermes: 3009df42da2b7015cc66fe4961b2ccca81160f1c - React-runtimescheduler: b79baa0ca5d8e8840ad49cbcdb44ab693d7fbdaa + React-RuntimeHermes: eff796dfd1df04f9f2cd8b37be37a47d90a4ab4c + React-runtimescheduler: 4bd885d85b7841b823c2164725c959c6dbc0fd4e React-timing: ddfc36f45351e851633b857cf75eb167e119d3b7 - React-utils: 9ea2e9d57dd01e5b9cf1270969e3179ac3b7f325 - ReactAppDependencyProvider: 19db96cb59117f0cf2e32993b7a2ba34b6397c57 - ReactCodegen: d3c2ea01d0f9eb6c3e5de3ad94ad2fc309465861 - ReactCommon: 179964ffc47fa62ad0e1eebac704e88c59b46667 - RNGestureHandler: 4e7defe5095e936424173fc75f0bf2af5bba8e23 - RNReanimated: 183ca222293bd622678e387100e54d03d952c73b - RNScreens: d8e95cae2849359428758a9b8651ccb9feb88ee3 + React-utils: d1482eca4f773398cf0bdb0b99283e16dc710a96 + ReactAppDependencyProvider: e7d2fe30cf4bb2090d5bea9b4ca29dd8e548ed71 + ReactCodegen: 87717e46389a7c2f57866d8ee66c8955bb41d986 + ReactCommon: bd1703fa1b6b6ccb2494bed17caf93f1861ce315 + RNGestureHandler: 70069ab3e0431b03f6e465b65745f87a1a02c6c0 + RNReanimated: bc7be90dec8df273a2d14da13a64f9da4b694e59 + RNScreens: e33d663f09210e3b2ad85969fd71d6b35c05231b SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 - Yoga: 330be28eee1242da875db9e851b19a4df496b999 + Yoga: 76eca883712bbdd12fcc754f2342f3ca307adb44 PODFILE CHECKSUM: 9368f39644a8576a848701c298cb4a4fd39a41bf -COCOAPODS: 1.15.2 +COCOAPODS: 1.14.3 diff --git a/react-navigation b/react-navigation index bddcc44ab0..174dd433d7 160000 --- a/react-navigation +++ b/react-navigation @@ -1 +1 @@ -Subproject commit bddcc44ab0e0ad5630f7ee0feb69496412a00217 +Subproject commit 174dd433d7c7bdd13958c8527760a688e64ab478 From 47538390159f07be04a25878489171a8a3366f62 Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Wed, 9 Apr 2025 15:30:54 +0200 Subject: [PATCH 2/8] Bump node verstion to latest stable and use .nvmrc in workflows --- .github/workflows/android-build-test-fabric.yml | 4 ++-- .github/workflows/android-build-test.yml | 4 ++-- .github/workflows/android-e2e-test-fabric.yml | 4 ++-- .github/workflows/android-e2e-test.yml | 2 +- .github/workflows/check-archs-consistency.yml | 2 +- .github/workflows/ios-build-test-fabric.yml | 2 +- .github/workflows/ios-build-test.yml | 2 +- .github/workflows/ios-e2e-test-fabric.yml | 2 +- .github/workflows/ios-e2e-test.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/tv-os-build-test.yml | 2 +- .github/workflows/windows-build-test.yml | 2 +- .nvmrc | 1 + 13 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 .nvmrc diff --git a/.github/workflows/android-build-test-fabric.yml b/.github/workflows/android-build-test-fabric.yml index 112620512f..4aba43c032 100644 --- a/.github/workflows/android-build-test-fabric.yml +++ b/.github/workflows/android-build-test-fabric.yml @@ -32,10 +32,10 @@ jobs: java-version: '17' distribution: 'zulu' cache: 'gradle' - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' cache-dependency-path: ${{ env.WORKING_DIRECTORY }}/yarn.lock - name: Install node dependencies diff --git a/.github/workflows/android-build-test.yml b/.github/workflows/android-build-test.yml index da7ce12970..be1b5589bb 100644 --- a/.github/workflows/android-build-test.yml +++ b/.github/workflows/android-build-test.yml @@ -30,10 +30,10 @@ jobs: java-version: '17' distribution: 'zulu' cache: 'gradle' - - name: Use Node.js 18 + - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' cache-dependency-path: | yarn.lock diff --git a/.github/workflows/android-e2e-test-fabric.yml b/.github/workflows/android-e2e-test-fabric.yml index fbed261b3a..49ec41921c 100644 --- a/.github/workflows/android-e2e-test-fabric.yml +++ b/.github/workflows/android-e2e-test-fabric.yml @@ -39,10 +39,10 @@ jobs: distribution: 'zulu' cache: 'gradle' - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' - name: Install root node dependencies diff --git a/.github/workflows/android-e2e-test.yml b/.github/workflows/android-e2e-test.yml index 5670536a24..7d85f140a0 100644 --- a/.github/workflows/android-e2e-test.yml +++ b/.github/workflows/android-e2e-test.yml @@ -42,7 +42,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' - name: Install root node dependencies diff --git a/.github/workflows/check-archs-consistency.yml b/.github/workflows/check-archs-consistency.yml index 027534abd2..978f1f2a5d 100644 --- a/.github/workflows/check-archs-consistency.yml +++ b/.github/workflows/check-archs-consistency.yml @@ -26,7 +26,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' - name: Install node dependencies run: yarn diff --git a/.github/workflows/ios-build-test-fabric.yml b/.github/workflows/ios-build-test-fabric.yml index 64ceb65502..4b35222e37 100644 --- a/.github/workflows/ios-build-test-fabric.yml +++ b/.github/workflows/ios-build-test-fabric.yml @@ -31,7 +31,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' cache-dependency-path: ${{ env.WORKING_DIRECTORY }}/yarn.lock - name: Use latest stable Xcode diff --git a/.github/workflows/ios-build-test.yml b/.github/workflows/ios-build-test.yml index d5d0b85909..4b15ff76e8 100644 --- a/.github/workflows/ios-build-test.yml +++ b/.github/workflows/ios-build-test.yml @@ -29,7 +29,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' cache-dependency-path: ${{ env.WORKING_DIRECTORY }}/yarn.lock - name: Use latest stable Xcode diff --git a/.github/workflows/ios-e2e-test-fabric.yml b/.github/workflows/ios-e2e-test-fabric.yml index 2842d64a78..bc46f29a4a 100644 --- a/.github/workflows/ios-e2e-test-fabric.yml +++ b/.github/workflows/ios-e2e-test-fabric.yml @@ -28,7 +28,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' - name: Use latest stable Xcode uses: maxim-lobanov/setup-xcode@v1 diff --git a/.github/workflows/ios-e2e-test.yml b/.github/workflows/ios-e2e-test.yml index 5f8ae479a0..66dc7370b4 100644 --- a/.github/workflows/ios-e2e-test.yml +++ b/.github/workflows/ios-e2e-test.yml @@ -28,7 +28,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' - name: Use latest stable Xcode uses: maxim-lobanov/setup-xcode@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 39598837a7..b57578b3de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' - name: Install node dependencies run: yarn diff --git a/.github/workflows/tv-os-build-test.yml b/.github/workflows/tv-os-build-test.yml index b693ed980c..e94e154b63 100644 --- a/.github/workflows/tv-os-build-test.yml +++ b/.github/workflows/tv-os-build-test.yml @@ -29,7 +29,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' cache-dependency-path: ${{ env.WORKING_DIRECTORY }}/yarn.lock - name: Install node dependencies diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml index 35cadd2b7e..b060172f2f 100644 --- a/.github/workflows/windows-build-test.yml +++ b/.github/workflows/windows-build-test.yml @@ -36,7 +36,7 @@ jobs: - name: Use Node.js 18 uses: actions/setup-node@v4 with: - node-version: 18 + node-version-file: '.nvmrc' cache: 'yarn' cache-dependency-path: | yarn.lock diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000000..5afafd98f8 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v23.11.0 From 9bb962991c93c1ace0fc0f5cb1a283a49f7a7030 Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Wed, 9 Apr 2025 15:31:59 +0200 Subject: [PATCH 3/8] Update Podfile.lock --- FabricExample/ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock index 24c79f8248..51f37b500d 100644 --- a/FabricExample/ios/Podfile.lock +++ b/FabricExample/ios/Podfile.lock @@ -2081,4 +2081,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 9368f39644a8576a848701c298cb4a4fd39a41bf -COCOAPODS: 1.14.3 +COCOAPODS: 1.16.2 From 5fa598f4405c550ce1a569966ca5202be914a8bc Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Thu, 10 Apr 2025 10:29:52 +0200 Subject: [PATCH 4/8] Update windows-build-test.yml --- .github/workflows/windows-build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml index b060172f2f..70eb611dd1 100644 --- a/.github/workflows/windows-build-test.yml +++ b/.github/workflows/windows-build-test.yml @@ -33,7 +33,7 @@ jobs: run: | mkdir WindowsExample - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' @@ -68,7 +68,7 @@ jobs: - name: Init example app working-directory: WindowsExample - run: npx react-native init-windows --overwrite + run: npx react-native init-windows --overwrite --logging - name: Replace react-native-screens files run: | From f86755c24c771aada0453751a56a6f115e8b6a63 Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Thu, 10 Apr 2025 10:31:45 +0200 Subject: [PATCH 5/8] Fix names --- .github/workflows/android-build-test-fabric.yml | 2 +- .github/workflows/android-build-test.yml | 2 +- .github/workflows/android-e2e-test.yml | 2 +- .github/workflows/check-archs-consistency.yml | 2 +- .github/workflows/ios-build-test.yml | 2 +- .github/workflows/ios-e2e-test-fabric.yml | 2 +- .github/workflows/ios-e2e-test.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/tv-os-build-test.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/android-build-test-fabric.yml b/.github/workflows/android-build-test-fabric.yml index 4aba43c032..d6d7f68cf6 100644 --- a/.github/workflows/android-build-test-fabric.yml +++ b/.github/workflows/android-build-test-fabric.yml @@ -32,7 +32,7 @@ jobs: java-version: '17' distribution: 'zulu' cache: 'gradle' - - name: Setup Node.js + - name: Setup Node uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/android-build-test.yml b/.github/workflows/android-build-test.yml index be1b5589bb..63433432e3 100644 --- a/.github/workflows/android-build-test.yml +++ b/.github/workflows/android-build-test.yml @@ -30,7 +30,7 @@ jobs: java-version: '17' distribution: 'zulu' cache: 'gradle' - - name: Setup node + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/android-e2e-test.yml b/.github/workflows/android-e2e-test.yml index 7d85f140a0..4a2e9c50c6 100644 --- a/.github/workflows/android-e2e-test.yml +++ b/.github/workflows/android-e2e-test.yml @@ -39,7 +39,7 @@ jobs: distribution: 'zulu' cache: 'gradle' - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/check-archs-consistency.yml b/.github/workflows/check-archs-consistency.yml index 978f1f2a5d..3e5ff442aa 100644 --- a/.github/workflows/check-archs-consistency.yml +++ b/.github/workflows/check-archs-consistency.yml @@ -23,7 +23,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-build-test.yml b/.github/workflows/ios-build-test.yml index 4b15ff76e8..ecf1f47f21 100644 --- a/.github/workflows/ios-build-test.yml +++ b/.github/workflows/ios-build-test.yml @@ -26,7 +26,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-e2e-test-fabric.yml b/.github/workflows/ios-e2e-test-fabric.yml index bc46f29a4a..be807e19a5 100644 --- a/.github/workflows/ios-e2e-test-fabric.yml +++ b/.github/workflows/ios-e2e-test-fabric.yml @@ -25,7 +25,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-e2e-test.yml b/.github/workflows/ios-e2e-test.yml index 66dc7370b4..f1d800b455 100644 --- a/.github/workflows/ios-e2e-test.yml +++ b/.github/workflows/ios-e2e-test.yml @@ -25,7 +25,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b57578b3de..747c48ad6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/tv-os-build-test.yml b/.github/workflows/tv-os-build-test.yml index e94e154b63..9c0843333a 100644 --- a/.github/workflows/tv-os-build-test.yml +++ b/.github/workflows/tv-os-build-test.yml @@ -26,7 +26,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' From 7a399a5971476edeb4ed8e299aabf485d53a8f0d Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Thu, 10 Apr 2025 11:49:03 +0200 Subject: [PATCH 6/8] Fix names and remove logging --- .github/workflows/android-build-test-fabric.yml | 2 +- .github/workflows/ios-build-test-fabric.yml | 2 +- .github/workflows/windows-build-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-build-test-fabric.yml b/.github/workflows/android-build-test-fabric.yml index d6d7f68cf6..4aba43c032 100644 --- a/.github/workflows/android-build-test-fabric.yml +++ b/.github/workflows/android-build-test-fabric.yml @@ -32,7 +32,7 @@ jobs: java-version: '17' distribution: 'zulu' cache: 'gradle' - - name: Setup Node + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-build-test-fabric.yml b/.github/workflows/ios-build-test-fabric.yml index 4b35222e37..3b16ce7eab 100644 --- a/.github/workflows/ios-build-test-fabric.yml +++ b/.github/workflows/ios-build-test-fabric.yml @@ -28,7 +28,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - - name: Use Node.js 18 + - name: Setup Node.js uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml index 70eb611dd1..9142fa61be 100644 --- a/.github/workflows/windows-build-test.yml +++ b/.github/workflows/windows-build-test.yml @@ -68,7 +68,7 @@ jobs: - name: Init example app working-directory: WindowsExample - run: npx react-native init-windows --overwrite --logging + run: npx react-native init-windows --overwrite - name: Replace react-native-screens files run: | From c87b4a0eb14971aad3ab8592411d90d4cbb6a05a Mon Sep 17 00:00:00 2001 From: kligarski <63918941+kligarski@users.noreply.github.com> Date: Thu, 10 Apr 2025 12:25:27 +0200 Subject: [PATCH 7/8] test(Windows): select react-native version for test project based on react-native-windows latest version (#2857) ## Description Select `react-native version` for test project based on `react-native-windows` latest version. Sometimes, when new `react-native` version is released but `react-native-windows` is not yet available for this version, CI might fail because of the version mismatch. Now we fetch latest version of `react-native-windows` from NPM in format `x.yy.zz` and we use `x.yy` to determine latest supported version of `react-native`. Then we use it to initialize new `react-native` project. ## Changes - modify Windows CI ## Test code and steps to reproduce Windows CI ## Checklist - [x] Ensured that Windows CI passes --- .github/workflows/windows-build-test.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml index 9142fa61be..316a0d8834 100644 --- a/.github/workflows/windows-build-test.yml +++ b/.github/workflows/windows-build-test.yml @@ -57,8 +57,23 @@ jobs: - name: Unpack library files run: tar -xzf (Get-ChildItem -Path .\*.tgz) + - name: Determine latest react-native version supported by react-native-windows + id: determine-rn-version + run: | + $rnwVersion = npm view react-native-windows version + if ($rnwVersion -match '(\d+)\.(\d+)\.') { + $major = $matches[1] + $minor = $matches[2] + $desiredVersion = "$major.$minor" + echo "Installing $desiredVersion version." + echo "rn=$desiredVersion" >> $env:GITHUB_OUTPUT + } else { + echo "Failed to parse version from npm. Installing latest version." + echo "rn=latest" >> $env:GITHUB_OUTPUT + } + - name: Create Example app - run: npx @react-native-community/cli@latest init WindowsExample + run: npx @react-native-community/cli@latest init WindowsExample --version ${{ steps.determine-rn-version.outputs.rn }} - name: Install app dependencies working-directory: WindowsExample From 95fa1180f0ba26c12ae7cb32da51f1b20e40fab1 Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Thu, 10 Apr 2025 12:27:25 +0200 Subject: [PATCH 8/8] chore: add changes from comments --- .github/workflows/android-build-test-fabric.yml | 2 +- .github/workflows/android-build-test.yml | 2 +- .github/workflows/android-e2e-test-fabric.yml | 2 +- .github/workflows/android-e2e-test.yml | 2 +- .github/workflows/check-archs-consistency.yml | 2 +- .github/workflows/ios-build-test-fabric.yml | 2 +- .github/workflows/ios-build-test.yml | 2 +- .github/workflows/ios-e2e-test-fabric.yml | 2 +- .github/workflows/ios-e2e-test.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/tv-os-build-test.yml | 2 +- .github/workflows/windows-build-test.yml | 2 +- react-navigation | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/android-build-test-fabric.yml b/.github/workflows/android-build-test-fabric.yml index 4aba43c032..e1a6a82b10 100644 --- a/.github/workflows/android-build-test-fabric.yml +++ b/.github/workflows/android-build-test-fabric.yml @@ -32,7 +32,7 @@ jobs: java-version: '17' distribution: 'zulu' cache: 'gradle' - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/android-build-test.yml b/.github/workflows/android-build-test.yml index 63433432e3..0a9bb176a6 100644 --- a/.github/workflows/android-build-test.yml +++ b/.github/workflows/android-build-test.yml @@ -30,7 +30,7 @@ jobs: java-version: '17' distribution: 'zulu' cache: 'gradle' - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/android-e2e-test-fabric.yml b/.github/workflows/android-e2e-test-fabric.yml index 49ec41921c..e2c26e9bee 100644 --- a/.github/workflows/android-e2e-test-fabric.yml +++ b/.github/workflows/android-e2e-test-fabric.yml @@ -39,7 +39,7 @@ jobs: distribution: 'zulu' cache: 'gradle' - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/android-e2e-test.yml b/.github/workflows/android-e2e-test.yml index 4a2e9c50c6..688680dcc6 100644 --- a/.github/workflows/android-e2e-test.yml +++ b/.github/workflows/android-e2e-test.yml @@ -39,7 +39,7 @@ jobs: distribution: 'zulu' cache: 'gradle' - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/check-archs-consistency.yml b/.github/workflows/check-archs-consistency.yml index 3e5ff442aa..f5610c1132 100644 --- a/.github/workflows/check-archs-consistency.yml +++ b/.github/workflows/check-archs-consistency.yml @@ -23,7 +23,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-build-test-fabric.yml b/.github/workflows/ios-build-test-fabric.yml index 3b16ce7eab..81c515bb53 100644 --- a/.github/workflows/ios-build-test-fabric.yml +++ b/.github/workflows/ios-build-test-fabric.yml @@ -28,7 +28,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-build-test.yml b/.github/workflows/ios-build-test.yml index ecf1f47f21..194df63651 100644 --- a/.github/workflows/ios-build-test.yml +++ b/.github/workflows/ios-build-test.yml @@ -26,7 +26,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-e2e-test-fabric.yml b/.github/workflows/ios-e2e-test-fabric.yml index be807e19a5..1eae845c5c 100644 --- a/.github/workflows/ios-e2e-test-fabric.yml +++ b/.github/workflows/ios-e2e-test-fabric.yml @@ -25,7 +25,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/ios-e2e-test.yml b/.github/workflows/ios-e2e-test.yml index f1d800b455..b18fc15b16 100644 --- a/.github/workflows/ios-e2e-test.yml +++ b/.github/workflows/ios-e2e-test.yml @@ -25,7 +25,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 747c48ad6d..2606a88cbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/tv-os-build-test.yml b/.github/workflows/tv-os-build-test.yml index 9c0843333a..1766534eae 100644 --- a/.github/workflows/tv-os-build-test.yml +++ b/.github/workflows/tv-os-build-test.yml @@ -26,7 +26,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml index 316a0d8834..2d44c96e2b 100644 --- a/.github/workflows/windows-build-test.yml +++ b/.github/workflows/windows-build-test.yml @@ -33,7 +33,7 @@ jobs: run: | mkdir WindowsExample - - name: Setup Node.js + - name: Setup Node.js (version from .nvmrc) uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' diff --git a/react-navigation b/react-navigation index 174dd433d7..df49c8a3a1 160000 --- a/react-navigation +++ b/react-navigation @@ -1 +1 @@ -Subproject commit 174dd433d7c7bdd13958c8527760a688e64ab478 +Subproject commit df49c8a3a154fc1308a2cad71c6e2d08a2c089b7