@@ -239,7 +239,7 @@ jobs:
239239 retention-days : 7
240240
241241 ios-build-test :
242- name : iOS (CocoaPods ${{ matrix.cocoapods }}, newArch=${{ matrix.new-arch }})
242+ name : iOS (newArch=${{ matrix.new-arch }})
243243 needs : changes
244244 if : needs.changes.outputs.ios == 'true'
245245 runs-on : macos-14
@@ -248,7 +248,6 @@ jobs:
248248 fail-fast : ${{ github.event_name == 'pull_request' }}
249249 max-parallel : 2
250250 matrix :
251- cocoapods : ${{ fromJSON(github.event_name == 'pull_request' && '["1.14.3"]' || '["1.10.1","1.11.0","1.14.3"]') }}
252251 new-arch : ['0', '1']
253252 steps :
254253 - name : Checkout the code
@@ -260,39 +259,27 @@ jobs:
260259 - name : Set up Ruby
261260 uses : ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
262261 with :
263- ruby-version : ' 2.7 '
264- bundler-cache : ${{ matrix.cocoapods == '1.14.3' }}
262+ ruby-version : ' 3.0 '
263+ bundler-cache : true
265264 working-directory : example
266265
267- - name : Install compatibility Ruby gems
268- if : matrix.cocoapods != '1.14.3'
269- run : |
270- gem install ffi -v 1.17.4 --no-document
271- gem install cocoapods -v ${{ matrix.cocoapods }} --no-document
272- gem install xcpretty -v 0.3.0 --no-document
273-
274266 - name : Cache Pods
275267 uses : actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
276268 with :
277269 path : |
278270 example/ios/Pods
279271 ~/Library/Caches/CocoaPods
280- key : ${{ runner.os }}-pods-no-flipper-${{ matrix.cocoapods }}- new-arch-${{ matrix.new-arch }}-${{ hashFiles('example/ios/Podfile.lock', 'example/Gemfile.lock') }}
272+ key : ${{ runner.os }}-pods-no-flipper-new-arch-${{ matrix.new-arch }}-${{ hashFiles('example/ios/Podfile.lock', 'example/Gemfile.lock') }}
281273 restore-keys : |
282- ${{ runner.os }}-pods-no-flipper-${{ matrix.cocoapods }}- new-arch-${{ matrix.new-arch }}-
274+ ${{ runner.os }}-pods-no-flipper-new-arch-${{ matrix.new-arch }}-
283275
284276 - name : Install Pods
285277 env :
286- COCOAPODS_VERSION : ${{ matrix.cocoapods }}
287278 NO_FLIPPER : ' 1'
288279 RCT_NEW_ARCH_ENABLED : ${{ matrix.new-arch }}
289280 run : |
290281 cd example/ios
291- if [[ "$COCOAPODS_VERSION" == "1.14.3" ]]; then
292- bundle exec pod install
293- else
294- pod install
295- fi
282+ bundle exec pod install
296283
297284 - name : Select an available iPhone simulator
298285 id : simulator
@@ -304,36 +291,19 @@ jobs:
304291 fi
305292 echo "udid=$simulator_udid" >> "$GITHUB_OUTPUT"
306293
307- - name : Build
308- env :
309- COCOAPODS_VERSION : ${{ matrix.cocoapods }}
310- run : |
311- set -o pipefail
312- cd example/ios
313- if [[ "$COCOAPODS_VERSION" == "1.14.3" ]]; then
314- xcodebuild -workspace BsDiffPatchExample.xcworkspace -scheme BsDiffPatchExample -configuration Release -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' | bundle exec xcpretty
315- else
316- xcodebuild -workspace BsDiffPatchExample.xcworkspace -scheme BsDiffPatchExample -configuration Release -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' | xcpretty
317- fi
318-
319294 - name : Test
320295 env :
321- COCOAPODS_VERSION : ${{ matrix.cocoapods }}
322296 SIMULATOR_UDID : ${{ steps.simulator.outputs.udid }}
323297 run : |
324298 set -o pipefail
325299 cd example/ios
326- if [[ "$COCOAPODS_VERSION" == "1.14.3" ]]; then
327- xcodebuild -workspace BsDiffPatchExample.xcworkspace -scheme BsDiffPatchExample -configuration Release -sdk iphonesimulator -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath "$RUNNER_TEMP/ios-tests.xcresult" test | bundle exec xcpretty
328- else
329- xcodebuild -workspace BsDiffPatchExample.xcworkspace -scheme BsDiffPatchExample -configuration Release -sdk iphonesimulator -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath "$RUNNER_TEMP/ios-tests.xcresult" test | xcpretty
330- fi
300+ xcodebuild -workspace BsDiffPatchExample.xcworkspace -scheme BsDiffPatchExample -configuration Release -sdk iphonesimulator -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath "$RUNNER_TEMP/ios-tests.xcresult" test | bundle exec xcpretty
331301
332302 - name : Upload iOS test results
333303 if : always()
334304 uses : actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
335305 with :
336- name : iOS-Test-Results-${{ matrix.cocoapods }}- new-arch-${{ matrix.new-arch }}
306+ name : iOS-Test-Results-new-arch-${{ matrix.new-arch }}
337307 path : ${{ runner.temp }}/ios-tests.xcresult
338308 if-no-files-found : ignore
339309 retention-days : 7
0 commit comments