From 40b2ce9df00409c763635b2b4a599d942c90104d Mon Sep 17 00:00:00 2001 From: dannami Date: Wed, 10 Jul 2024 13:20:51 -0600 Subject: [PATCH 1/2] update args --- .github/workflows/app_prod.yaml | 4 ++-- .github/workflows/app_stg.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/app_prod.yaml b/.github/workflows/app_prod.yaml index 3049984d..29ccf8e0 100644 --- a/.github/workflows/app_prod.yaml +++ b/.github/workflows/app_prod.yaml @@ -158,7 +158,7 @@ jobs: - name: Install the provisioning profile run: | PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision - echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode --output $PP_PATH + echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode -o $PP_PATH mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles env: @@ -278,7 +278,7 @@ jobs: - name: Install the provisioning profile run: | PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision - echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode --output $PP_PATH + echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode -o $PP_PATH mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles env: diff --git a/.github/workflows/app_stg.yaml b/.github/workflows/app_stg.yaml index 7d159410..0a25976b 100644 --- a/.github/workflows/app_stg.yaml +++ b/.github/workflows/app_stg.yaml @@ -158,7 +158,7 @@ jobs: - name: Install the provisioning profile run: | PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision - echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode --output $PP_PATH + echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode -o $PP_PATH mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles env: @@ -278,7 +278,7 @@ jobs: - name: Install the provisioning profile run: | PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision - echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode --output $PP_PATH + echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode -o $PP_PATH mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles env: From bbb058571556ab581feac55ce19cfe865a8903d7 Mon Sep 17 00:00:00 2001 From: dannami Date: Wed, 10 Jul 2024 13:40:36 -0600 Subject: [PATCH 2/2] yoga patch --- .github/workflows/app_prod.yaml | 10 ++++++++++ .github/workflows/app_stg.yaml | 10 ++++++++++ examples/Basic/patches/yoga-compilation-fix.patch | 11 +++++++++++ .../TestNamiTV/patches/yoga-compilation-fix.patch | 11 +++++++++++ 4 files changed, 42 insertions(+) create mode 100644 examples/Basic/patches/yoga-compilation-fix.patch create mode 100644 examples/TestNamiTV/patches/yoga-compilation-fix.patch diff --git a/.github/workflows/app_prod.yaml b/.github/workflows/app_prod.yaml index 29ccf8e0..b3979c7a 100644 --- 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 index 0a25976b..597d3107 100644 --- 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 new file mode 100644 index 00000000..68fded17 --- /dev/null +++ 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 new file mode 100644 index 00000000..68fded17 --- /dev/null +++ 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;