From cca31dfb0111ff9c3f9708f71ead6216655fc2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 11:45:39 +0200 Subject: [PATCH 01/10] init --- .../check-expo-dev-client-nightly.yml | 28 +++++++++++-------- .../workflows/helper/configureDevClient.js | 8 +++--- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index 4498ee2c1ce..85a7224319e 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -27,9 +27,9 @@ jobs: with: path: 'reanimated_repo' - name: Create Expo app - run: npx create-expo-app app + run: npx create-expo-app ExpoApp - name: Install expo-dev-client - working-directory: app + working-directory: ExpoApp run: | if npm view expo dist-tags | grep -q 'next:' ; then npm install expo@next @@ -37,22 +37,23 @@ jobs: npm install expo@latest fi - name: Setup configuration + working-directory: ExpoApp run: node ${{ env.SCRIPT_PATH }} setBundleIdentifier - name: Expo prebuild - working-directory: app + working-directory: ExpoApp run: npx expo prebuild - name: Install Reanimated - working-directory: app + working-directory: ExpoApp run: npm install react-native-reanimated@nightly - name: Set Fabric if: ${{ matrix.react-native-architecture == 'Fabric' }} run: node ${{ env.SCRIPT_PATH }} setupFabricIOS - name: Install Pods - working-directory: app/ios + working-directory: ExpoApp/ios run: pod install - name: Build app - working-directory: app - run: yarn react-native run-ios --simulator='iPhone 14' + working-directory: ExpoApp + run: npx react-native run-ios --simulator='iPhone 14' build_android: if: github.repository == 'software-mansion/react-native-reanimated' @@ -70,9 +71,14 @@ jobs: with: path: 'reanimated_repo' - name: Create Expo app - run: npx create-expo-app app + run: npx create-expo-app ExpoApp + - name: Setup Java 17 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: 17 - name: Install expo-dev-client - working-directory: app + working-directory: ExpoApp run: | if npm view expo dist-tags | grep -q 'next:' ; then npm install expo@next @@ -82,10 +88,10 @@ jobs: - name: Setup configuration run: node ${{ env.SCRIPT_PATH }} setBundleIdentifier - name: Expo prebuild - working-directory: app + working-directory: ExpoApp run: npx expo prebuild - name: Install Reanimated - working-directory: app + working-directory: ExpoApp run: npm install react-native-reanimated@nightly - name: Set Fabric if: ${{ matrix.react-native-architecture == 'Fabric' }} diff --git a/.github/workflows/helper/configureDevClient.js b/.github/workflows/helper/configureDevClient.js index ef45903c8b3..8a54abd1123 100644 --- a/.github/workflows/helper/configureDevClient.js +++ b/.github/workflows/helper/configureDevClient.js @@ -10,13 +10,13 @@ const command = process.argv[2]; if (command === 'setBundleIdentifier') { patchFile( - 'app/app.json', + 'app.json', '"ios": {', '"ios": {"bundleIdentifier":"com.swmansion.app",' ); patchFile( - 'app/app.json', + 'app.json', '"android": {', '"android": {"package": "com.swmansion.app",' ); @@ -24,7 +24,7 @@ if (command === 'setBundleIdentifier') { if (command === 'setupFabricIOS') { patchFile( - 'app/ios/Podfile.properties.json', + 'ios/Podfile.properties.json', '"expo.jsEngine"', '"newArchEnabled":"true","expo.jsEngine"' ); @@ -32,7 +32,7 @@ if (command === 'setupFabricIOS') { if (command === 'setupFabricAndroid') { patchFile( - 'app/android/gradle.properties', + 'android/gradle.properties', 'newArchEnabled=false', 'newArchEnabled=true' ); From 396a55d1c4d69ad9eac4a2f57a751690515b9c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 12:26:12 +0200 Subject: [PATCH 02/10] use relative path --- .github/workflows/check-expo-dev-client-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index 85a7224319e..63be29e104c 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -1,7 +1,7 @@ name: Check Expo dev-client nightly build env: YARN_ENABLE_HARDENED_MODE: 0 - SCRIPT_PATH: reanimated_repo/.github/workflows/helper/configureDevClient.js + SCRIPT_PATH: ../.github/workflows/helper/configureDevClient.js on: pull_request: paths: From 711a9bf552743a6d4a8fa5d9d129eacf2ac036ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 12:33:54 +0200 Subject: [PATCH 03/10] use relative path v2 --- .github/workflows/check-expo-dev-client-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index 63be29e104c..baa29b90248 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -1,7 +1,7 @@ name: Check Expo dev-client nightly build env: YARN_ENABLE_HARDENED_MODE: 0 - SCRIPT_PATH: ../.github/workflows/helper/configureDevClient.js + SCRIPT_PATH: ${{github.workspace}}/react-native-reanimated/.github/workflows/helper/configureDevClient.js on: pull_request: paths: From f247238450c3eee19fc3c22ffd96aae02d36de19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 12:40:34 +0200 Subject: [PATCH 04/10] third time the charm --- .github/workflows/check-expo-dev-client-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index baa29b90248..505d78d1c58 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -1,7 +1,7 @@ name: Check Expo dev-client nightly build env: YARN_ENABLE_HARDENED_MODE: 0 - SCRIPT_PATH: ${{github.workspace}}/react-native-reanimated/.github/workflows/helper/configureDevClient.js + SCRIPT_PATH: .github/workflows/helper/configureDevClient.js on: pull_request: paths: From d945e87879e690b208b10a128995a26bd3faf7ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 12:43:01 +0200 Subject: [PATCH 05/10] paths pls --- .github/workflows/check-expo-dev-client-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index 505d78d1c58..0555657d426 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -1,7 +1,7 @@ name: Check Expo dev-client nightly build env: YARN_ENABLE_HARDENED_MODE: 0 - SCRIPT_PATH: .github/workflows/helper/configureDevClient.js + SCRIPT_PATH: /react-native-reanimated/.github/workflows/helper/configureDevClient.js on: pull_request: paths: From 6910ddb7550b8ac2cac19841a4cdd361f1e8f6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 12:48:39 +0200 Subject: [PATCH 06/10] debug commit --- .github/workflows/check-expo-dev-client-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index 0555657d426..c15f2e7431e 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -1,7 +1,7 @@ name: Check Expo dev-client nightly build env: YARN_ENABLE_HARDENED_MODE: 0 - SCRIPT_PATH: /react-native-reanimated/.github/workflows/helper/configureDevClient.js + SCRIPT_PATH: ${{ github.workspace }}/.github/workflows/helper/configureDevClient.js on: pull_request: paths: @@ -47,7 +47,7 @@ jobs: run: npm install react-native-reanimated@nightly - name: Set Fabric if: ${{ matrix.react-native-architecture == 'Fabric' }} - run: node ${{ env.SCRIPT_PATH }} setupFabricIOS + run: echo ${{env.SCRIPT_PATH}} && pwd && echo ${{ github.workspace }} && node ${{ env.SCRIPT_PATH }} setupFabricIOS - name: Install Pods working-directory: ExpoApp/ios run: pod install From 191b9e3a9383ac020231073be47cdd83646026c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 13:11:01 +0200 Subject: [PATCH 07/10] debug commit v2 --- .github/workflows/check-expo-dev-client-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index c15f2e7431e..b2c571ab2af 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -38,7 +38,7 @@ jobs: fi - name: Setup configuration working-directory: ExpoApp - run: node ${{ env.SCRIPT_PATH }} setBundleIdentifier + run: echo ${{env.SCRIPT_PATH}} && pwd && echo ${{ github.workspace }} && node ${{ env.SCRIPT_PATH }} setBundleIdentifier - name: Expo prebuild working-directory: ExpoApp run: npx expo prebuild @@ -47,7 +47,7 @@ jobs: run: npm install react-native-reanimated@nightly - name: Set Fabric if: ${{ matrix.react-native-architecture == 'Fabric' }} - run: echo ${{env.SCRIPT_PATH}} && pwd && echo ${{ github.workspace }} && node ${{ env.SCRIPT_PATH }} setupFabricIOS + run: node ${{ env.SCRIPT_PATH }} setupFabricIOS - name: Install Pods working-directory: ExpoApp/ios run: pod install From e1ae0862242be7a7c53031d193bc4ce01fda1d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 13:50:29 +0200 Subject: [PATCH 08/10] debug commit v3 --- .github/workflows/check-expo-dev-client-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index b2c571ab2af..a3efb0430ad 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -1,7 +1,7 @@ name: Check Expo dev-client nightly build env: YARN_ENABLE_HARDENED_MODE: 0 - SCRIPT_PATH: ${{ github.workspace }}/.github/workflows/helper/configureDevClient.js + SCRIPT_PATH: ${{github.workspace}}/reanimated_repo/.github/workflows/helper/configureDevClient.js on: pull_request: paths: @@ -38,7 +38,7 @@ jobs: fi - name: Setup configuration working-directory: ExpoApp - run: echo ${{env.SCRIPT_PATH}} && pwd && echo ${{ github.workspace }} && node ${{ env.SCRIPT_PATH }} setBundleIdentifier + run: ls ${{github.workspace}} ${{env.SCRIPT_PATH}} && pwd && echo ${{ github.workspace }} && node ${{ env.SCRIPT_PATH }} setBundleIdentifier - name: Expo prebuild working-directory: ExpoApp run: npx expo prebuild From 09f06ea8c4b673f8a574db92c7beb5ea5205745c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 14:10:53 +0200 Subject: [PATCH 09/10] debug commit v4 --- .github/workflows/check-expo-dev-client-nightly.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index a3efb0430ad..9c5ab3d35e0 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -38,7 +38,7 @@ jobs: fi - name: Setup configuration working-directory: ExpoApp - run: ls ${{github.workspace}} ${{env.SCRIPT_PATH}} && pwd && echo ${{ github.workspace }} && node ${{ env.SCRIPT_PATH }} setBundleIdentifier + run: node ${{ env.SCRIPT_PATH }} setBundleIdentifier - name: Expo prebuild working-directory: ExpoApp run: npx expo prebuild @@ -53,7 +53,7 @@ jobs: run: pod install - name: Build app working-directory: ExpoApp - run: npx react-native run-ios --simulator='iPhone 14' + run: npx react-native run-ios --simulator='iPhone 14' --terminal='Terminal' build_android: if: github.repository == 'software-mansion/react-native-reanimated' @@ -86,6 +86,7 @@ jobs: npm install expo@latest fi - name: Setup configuration + working-directory: ExpoApp run: node ${{ env.SCRIPT_PATH }} setBundleIdentifier - name: Expo prebuild working-directory: ExpoApp @@ -94,8 +95,9 @@ jobs: working-directory: ExpoApp run: npm install react-native-reanimated@nightly - name: Set Fabric + working-directory: ExpoApp if: ${{ matrix.react-native-architecture == 'Fabric' }} run: node ${{ env.SCRIPT_PATH }} setupFabricAndroid - name: Build app - working-directory: app/android + working-directory: ExpoApp/android run: ./gradlew assembleDebug --console=plain From a846cc3118735a4c1bf797b7021523abf340d8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Mon, 15 Apr 2024 14:22:24 +0200 Subject: [PATCH 10/10] add missing working directory --- .github/workflows/check-expo-dev-client-nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-expo-dev-client-nightly.yml b/.github/workflows/check-expo-dev-client-nightly.yml index 9c5ab3d35e0..b84c3886446 100644 --- a/.github/workflows/check-expo-dev-client-nightly.yml +++ b/.github/workflows/check-expo-dev-client-nightly.yml @@ -46,6 +46,7 @@ jobs: working-directory: ExpoApp run: npm install react-native-reanimated@nightly - name: Set Fabric + working-directory: ExpoApp if: ${{ matrix.react-native-architecture == 'Fabric' }} run: node ${{ env.SCRIPT_PATH }} setupFabricIOS - name: Install Pods