chore: update CI

th3rdwave · Oct 31, 2024 · 2169743 · 2169743
1 parent 2a8d39a
commit 2169743
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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,8 +58,8 @@ 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
+        run: xcodebuild -scheme ReactTestApp -workspace RNSACExample.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug
         working-directory: example/ios
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -40,6 +40,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 # Note that this is incompatible with web debugging.
+# the project property passed by CI (-PnewArchEnabled=false) takes precedence over the following
 newArchEnabled=true
 bridgelessEnabled=true
 

diff --git 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
@@ -1986,6 +1986,6 @@ SPEC CHECKSUMS:
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: 157bed1c62656587df4639d4dc29714898f8fb10
 
-PODFILE CHECKSUM: 352e8510c9f10cba42bd8081cb7c91dfb1d1f66e
+PODFILE CHECKSUM: 0fafacc6692f2be08ea55bd74268ec824584f1f4
 
 COCOAPODS: 1.15.2