diff --git a/.circleci/config.yml b/.circleci/config.yml index 990e9c3c885..533cd7e75d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -350,7 +350,7 @@ android_defaults: &android_defaults macos_defaults: &macos_defaults <<: *defaults macos: - xcode: "9.4.0" + xcode: "10.1.0" version: 2 jobs: @@ -433,32 +433,6 @@ jobs: - store_test_results: path: ~/react-native/reports/junit - # Xcode 10: Runs unit tests on iOS and Apple TV devices - test_objc_xcode10: - <<: *defaults - macos: - xcode: "10.0.0" - steps: - - checkout - - run: *setup-artifacts - - run: *yarn - - - run: *boot-simulator-iphone - - run: *boot-simulator-appletv - - run: *brew-install-watchman - - - run: *run-objc-ios-tests - - run: *run-objc-tvos-tests - - # TODO: Fix these failing tests. - - run: *display-broken-tests-warning - - run: *run-podspec-tests - - run: *run-objc-ios-e2e-tests - - run: *run-objc-tvos-e2e-tests - - - store_test_results: - path: ~/react-native/reports/junit - # Runs end to end tests (Detox) test_detox_end_to_end: <<: *macos_defaults @@ -709,8 +683,6 @@ workflows: - checkout_code # Tooling Compatibility Checks - - test_objc_xcode10: - filters: *filter-ignore-gh-pages - test_node10: filters: *filter-ignore-gh-pages diff --git a/scripts/objc-test-tvos.sh b/scripts/objc-test-tvos.sh index f018f3cf202..e58ac222f5a 100755 --- a/scripts/objc-test-tvos.sh +++ b/scripts/objc-test-tvos.sh @@ -24,15 +24,7 @@ source "scripts/.tests.env" export TEST_NAME="tvOS" export SCHEME="RNTester-tvOS" export SDK="appletvsimulator" -<<<<<<< HEAD -export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=11.4" - -# If there's a "test" argument, pass it to the test script. -. ./scripts/objc-test.sh $1 - -======= export DESTINATION="platform=tvOS Simulator,name=${TVOS_DEVICE},OS=${IOS_TARGET_OS}" # If there's a "test" argument, pass it to the test script. ./scripts/objc-test.sh $1 ->>>>>>> 5194495e97... Propagate exit code in test_objc (#22562)