@@ -205,13 +205,21 @@ aliases:
205205 command : |
206206 mkdir -p ~/react-native/reports/junit/
207207
208- - &run-objc_ios-tests
209- name : Objective-C iOS Test Suite
208+ - &build-objc-ios-test-app
209+ name : Build Objective-C iOS Test App
210210 command : ./scripts/objc-test-ios.sh
211+
212+ - &run-objc-ios-tests
213+ name : Objective-C iOS Test Suite
214+ command : ./scripts/objc-test-ios.sh test
215+
216+ - &build-objc-tvos-test-app
217+ name : Build Objective-C tvOS Test App
218+ command : ./scripts/objc-test-tvos.sh
211219
212220 - &run-objc-tvos-tests
213221 name : Objective-C tvOS Test Suite
214- command : ./scripts/objc-test-tvos.sh
222+ command : ./scripts/objc-test-tvos.sh test
215223
216224 - &run-objc-ios-e2e-tests
217225 name : Objective-C iOS End-to-End Test Suite
@@ -245,7 +253,7 @@ android_defaults: &android_defaults
245253macos_defaults : &macos_defaults
246254 << : *defaults
247255 macos :
248- xcode : " 9.0"
256+ xcode : " 9.2. 0"
249257
250258version : 2
251259jobs :
@@ -317,29 +325,53 @@ jobs:
317325 - store_artifacts :
318326 path : ~/react-native/reports/junit
319327
328+ # Builds iOS test app
329+ build_objc_ios_test_app :
330+ << : *macos_defaults
331+ dependencies :
332+ pre :
333+ - xcrun instruments -w "iPhone 5s (11.1)" || true
334+ steps :
335+ - attach_workspace :
336+ at : ~/react-native
337+
338+ - run : *build-objc-ios-test-app
339+
320340 # Runs unit tests on iOS devices
321341 test_objc_ios :
322342 << : *macos_defaults
323343 dependencies :
324344 pre :
325- - xcrun instruments -w "iPhone 5s (10.3 .1)" || true
345+ - xcrun instruments -w "iPhone 5s (11 .1)" || true
326346 steps :
327347 - attach_workspace :
328348 at : ~/react-native
329349
330- - run : *run-objc_ios -tests
350+ - run : *run-objc-ios -tests
331351
332352 - store_test_results :
333353 path : ~/react-native/reports/junit
334354 - store_artifacts :
335355 path : ~/react-native/reports/junit
336356
357+ # Builds tvOS test app
358+ build_objc_tvos_test_app :
359+ << : *macos_defaults
360+ dependencies :
361+ pre :
362+ - xcrun instruments -w "Apple TV 1080p (11.1)" || true
363+ steps :
364+ - attach_workspace :
365+ at : ~/react-native
366+
367+ - run : *build-objc-tvos-test-app
368+
337369 # Runs unit tests on tvOS devices
338370 test_objc_tvos :
339371 << : *macos_defaults
340372 dependencies :
341373 pre :
342- - xcrun instruments -w "Apple TV 1080p (10.0 )" || true
374+ - xcrun instruments -w "Apple TV 1080p (11.1 )" || true
343375 steps :
344376 - attach_workspace :
345377 at : ~/react-native
@@ -356,7 +388,7 @@ jobs:
356388 << : *macos_defaults
357389 dependencies :
358390 pre :
359- - xcrun instruments -w "iPhone 5s (10.3 .1)" || true
391+ - xcrun instruments -w "iPhone 5s (11 .1)" || true
360392 steps :
361393 - attach_workspace :
362394 at : ~/react-native
@@ -370,9 +402,7 @@ jobs:
370402
371403 # Checks podspec
372404 test_podspec :
373- << : *defaults
374- macos :
375- xcode : " 9.0"
405+ << : *macos_defaults
376406 steps :
377407 - attach_workspace :
378408 at : ~/react-native
@@ -537,7 +567,7 @@ jobs:
537567workflows :
538568 version : 2
539569
540- test :
570+ tests :
541571 jobs :
542572
543573 # Checkout repo and run Yarn
@@ -566,12 +596,12 @@ workflows:
566596 requires :
567597 - checkout_code
568598
569- # Test iOS & tvOS
570- - test_objc_ios :
599+ # Build iOS & tvOS test apps
600+ - build_objc_ios_test_app :
571601 filters : *filter-ignore-gh-pages
572602 requires :
573603 - checkout_code
574- - test_objc_tvos :
604+ - build_objc_tvos_test_app :
575605 filters : *filter-ignore-gh-pages
576606 requires :
577607 - checkout_code
@@ -606,3 +636,30 @@ workflows:
606636 - publish_npm_package :
607637 requires :
608638 - approve_publish_npm_package
639+
640+ # These tests are flaky or are yet to be fixed. They are placed on their own
641+ # workflow to avoid marking benign PRs as broken.
642+ # To run them, uncomment the entire block and open a PR (do not merge).
643+ # Once a test is fixed, move the test definition to the 'tests' workflow.
644+ # disabled_tests:
645+ # jobs:
646+ # # Checkout repo and run Yarn (pre-req, should succeed)
647+ # - checkout_code:
648+ # filters: *filter-ignore-gh-pages
649+
650+ # # The following were DISABLED because they have not run since
651+ # # the migration from Travis, and they have broken since then,
652+ # # Test iOS & tvOS
653+ # - test_objc_ios:
654+ # filters: *filter-ignore-gh-pages
655+ # requires:
656+ # - checkout_code
657+ # - test_objc_tvos:
658+ # filters: *filter-ignore-gh-pages
659+ # requires:
660+ # - checkout_code
661+ # # CocoaPods
662+ # - test_podspec:
663+ # filters: *filter-ignore-gh-pages
664+ # requires:
665+ # - checkout_code
0 commit comments