Skip to content

Commit b8c0d9d

Browse files
hramosgrabbou
authored andcommitted
Bump RN OSS iOS tests to iOS SDK 12.1, Xcode 10.1
Summary: Use Xcode 10.1 and iOS 12.1 SDK to run iOS tests on an iOS 12.1 iPhone XS Simulator, all of which are available on a default Xcode 10.1 install. Note that we were previously running iOS tests using Xcode 10.1 and the 12.1 SDK in a separate `test_xcode10` workflow on Circle CI. This was in place to allow us to track Xcode 10 compatibility during the Xcode 10 beta. Now that Xcode 10 has been public for a while, we can drop the compatibility check and use Xcode 10 in our main iOS test workflow. Reviewed By: TheSavior Differential Revision: D13317891 fbshipit-source-id: 04c17bf3a2e9d3617f14a46b4ed30a5491a4f4a4
1 parent 7c04c09 commit b8c0d9d

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

.circleci/config.yml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ android_defaults: &android_defaults
350350
macos_defaults: &macos_defaults
351351
<<: *defaults
352352
macos:
353-
xcode: "9.4.0"
353+
xcode: "10.1.0"
354354

355355
version: 2
356356
jobs:
@@ -433,32 +433,6 @@ jobs:
433433
- store_test_results:
434434
path: ~/react-native/reports/junit
435435

436-
# Xcode 10: Runs unit tests on iOS and Apple TV devices
437-
test_objc_xcode10:
438-
<<: *defaults
439-
macos:
440-
xcode: "10.0.0"
441-
steps:
442-
- checkout
443-
- run: *setup-artifacts
444-
- run: *yarn
445-
446-
- run: *boot-simulator-iphone
447-
- run: *boot-simulator-appletv
448-
- run: *brew-install-watchman
449-
450-
- run: *run-objc-ios-tests
451-
- run: *run-objc-tvos-tests
452-
453-
# TODO: Fix these failing tests.
454-
- run: *display-broken-tests-warning
455-
- run: *run-podspec-tests
456-
- run: *run-objc-ios-e2e-tests
457-
- run: *run-objc-tvos-e2e-tests
458-
459-
- store_test_results:
460-
path: ~/react-native/reports/junit
461-
462436
# Runs end to end tests (Detox)
463437
test_detox_end_to_end:
464438
<<: *macos_defaults
@@ -709,8 +683,6 @@ workflows:
709683
- checkout_code
710684

711685
# Tooling Compatibility Checks
712-
- test_objc_xcode10:
713-
filters: *filter-ignore-gh-pages
714686
- test_node10:
715687
filters: *filter-ignore-gh-pages
716688

scripts/objc-test-tvos.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,7 @@ source "scripts/.tests.env"
2424
export TEST_NAME="tvOS"
2525
export SCHEME="RNTester-tvOS"
2626
export SDK="appletvsimulator"
27-
<<<<<<< HEAD
28-
export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=11.4"
29-
30-
# If there's a "test" argument, pass it to the test script.
31-
. ./scripts/objc-test.sh $1
32-
33-
=======
3427
export DESTINATION="platform=tvOS Simulator,name=${TVOS_DEVICE},OS=${IOS_TARGET_OS}"
3528

3629
# If there's a "test" argument, pass it to the test script.
3730
./scripts/objc-test.sh $1
38-
>>>>>>> 5194495e97... Propagate exit code in test_objc (#22562)

0 commit comments

Comments
 (0)