CI: Sample Apps - Patch Yoga (macOS 13) (#325)

* update args * yoga patch
namiml · Jul 10, 2024 · c4e9665 · c4e9665
1 parent 3f390dd
commit c4e9665
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 0 deletions.
diff --git a/.github/workflows/app_prod.yaml b/.github/workflows/app_prod.yaml
@@ -201,6 +201,11 @@ jobs:
             pod install --repo-update
           working-directory: source/examples/Basic/ios
 
+        - name: Apply Patches
+          run: |
+            patch -p0 < *.patch
+          working-directory: source/examples/Basic/patches
+
         - name: Build resolve Swift dependencies
           run: |
             xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme BasicProduction -configuration Release
@@ -321,6 +326,11 @@ jobs:
           RCT_NEW_ARCH_ENABLED=0 SWIFT_VERSION=5 pod install --repo-update
         working-directory: source/examples/TestNamiTV/ios
 
+      - name: Apply Patches
+        run: |
+          patch -p0 < *.patch
+        working-directory: source/examples/TextNamiTV/patches
+
       - name: Build resolve Swift dependencies
         run: |
           xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme Basic-tvOS-PROD -configuration Release

diff --git a/.github/workflows/app_stg.yaml b/.github/workflows/app_stg.yaml
@@ -201,6 +201,11 @@ jobs:
           pod install --repo-update
         working-directory: source/examples/Basic/ios
 
+      - name: Apply Patches
+        run: |
+          patch -p0 < *.patch
+        working-directory: source/examples/Basic/patches
+
       - name: Build resolve Swift dependencies
         run: |
           xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme Basic -configuration Release
@@ -321,6 +326,11 @@ jobs:
           RCT_NEW_ARCH_ENABLED=0 SWIFT_VERSION=5 pod install --repo-update
         working-directory: source/examples/TestNamiTV/ios
 
+      - name: Apply Patches
+        run: |
+          patch -p0 < *.patch
+        working-directory: source/examples/TestNamiTV/patches
+
       - name: Build resolve Swift dependencies
         run: |
           xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme Basic-tvOS -configuration Release

diff --git a/examples/Basic/patches/yoga-compilation-fix.patch b/examples/Basic/patches/yoga-compilation-fix.patch
@@ -0,0 +1,11 @@
+--- ../node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp.orig	2024-07-10 13:35:29
++++ ../node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp	2024-07-10 11:54:48
+@@ -2229,7 +2229,7 @@
+         depth,
+         generationCount);
+     node->setLayoutHadOverflow(
+-        node->getLayout().hadOverflow() |
++        node->getLayout().hadOverflow() ||
+         currentRelativeChild->getLayout().hadOverflow());
+   }
+   return deltaFreeSpace;
diff --git a/examples/TestNamiTV/patches/yoga-compilation-fix.patch b/examples/TestNamiTV/patches/yoga-compilation-fix.patch
@@ -0,0 +1,11 @@
+--- ../node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp.orig	2024-07-10 13:35:29
++++ ../node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp	2024-07-10 11:54:48
+@@ -2229,7 +2229,7 @@
+         depth,
+         generationCount);
+     node->setLayoutHadOverflow(
+-        node->getLayout().hadOverflow() |
++        node->getLayout().hadOverflow() ||
+         currentRelativeChild->getLayout().hadOverflow());
+   }
+   return deltaFreeSpace;