From 92add252416297e1781871183d0d450eae49c262 Mon Sep 17 00:00:00 2001 From: Vojtech Novak Date: Thu, 31 Oct 2024 11:32:22 +0100 Subject: [PATCH] chore: update CI --- .github/workflows/ios.yml | 6 +++--- example/ios/Podfile | 3 ++- example/ios/Podfile.lock | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 38eeb1c4..da72b901 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -34,10 +34,10 @@ jobs: run: yarn install working-directory: example - name: Install pods - run: bundle exec pod install + run: RCT_NEW_ARCH_ENABLED=0 npx pod-install working-directory: example/ios - name: Build ios example app - run: xcodebuild -scheme RNSACExample -workspace RNSACExample.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug + run: xcodebuild -scheme ReactTestApp -workspace RNSACExample.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug working-directory: example/ios ios-build-fabric: runs-on: macos-latest @@ -58,7 +58,7 @@ jobs: run: yarn install working-directory: example - name: Install pods for new arch - run: RCT_NEW_ARCH_ENABLED=1 bundle exec pod install + run: RCT_NEW_ARCH_ENABLED=1 npx pod-install working-directory: example/ios - name: Build ios example app run: xcodebuild -scheme RNSACExample -workspace RNSACExample.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug diff --git a/example/ios/Podfile b/example/ios/Podfile index e77db7b7..522b63d8 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -4,9 +4,10 @@ ws_dir = ws_dir.parent until ws_dir.expand_path.to_s == '/' require "#{ws_dir}/node_modules/react-native-test-app/test_app.rb" -workspace 'safe-area-example.xcworkspace' +workspace 'RNSACExample.xcworkspace' options = { +# RCT_NEW_ARCH_ENABLED env variable (used in CI) takes precedence over the following :bridgeless_enabled => true, :fabric_enabled => true, :hermes_enabled => true, diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 8add1a66..c7446e5f 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1986,6 +1986,6 @@ SPEC CHECKSUMS: SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Yoga: 157bed1c62656587df4639d4dc29714898f8fb10 -PODFILE CHECKSUM: 352e8510c9f10cba42bd8081cb7c91dfb1d1f66e +PODFILE CHECKSUM: 0fafacc6692f2be08ea55bd74268ec824584f1f4 COCOAPODS: 1.15.2