Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jul 10, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40b2ce9
update args
namidan Jul 10, 2024
bbb0585
yoga patch
namidan Jul 10, 2024
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
14 changes: 12 additions & 2 deletions .github/workflows/app_prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -278,7 +283,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:
Expand Down Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/app_stg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -278,7 +283,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:
Expand Down Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions examples/Basic/patches/yoga-compilation-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
11 changes: 11 additions & 0 deletions examples/TestNamiTV/patches/yoga-compilation-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Loading