Skip to content

Commit 04af674

Browse files
hramosfacebook-github-bot
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 424d445 commit 04af674

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

.circleci/config.yml

+1-29
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ android_defaults: &android_defaults
357357
macos_defaults: &macos_defaults
358358
<<: *defaults
359359
macos:
360-
xcode: "9.4.0"
360+
xcode: "10.1.0"
361361

362362
version: 2
363363
jobs:
@@ -446,32 +446,6 @@ jobs:
446446
- store_test_results:
447447
path: ~/react-native/reports/junit
448448

449-
# Xcode 10: Runs unit tests on iOS and Apple TV devices
450-
test_objc_xcode10:
451-
<<: *defaults
452-
macos:
453-
xcode: "10.0.0"
454-
steps:
455-
- checkout
456-
- run: *setup-artifacts
457-
- run: *yarn
458-
459-
- run: *boot-simulator-iphone
460-
- run: *boot-simulator-appletv
461-
- run: *brew-install-watchman
462-
463-
- run: *run-objc-ios-tests
464-
- run: *run-objc-tvos-tests
465-
466-
# TODO: Fix these failing tests.
467-
- run: *display-broken-tests-warning
468-
- run: *run-podspec-tests
469-
- run: *run-objc-ios-e2e-tests
470-
- run: *run-objc-tvos-e2e-tests
471-
472-
- store_test_results:
473-
path: ~/react-native/reports/junit
474-
475449
# Runs end to end tests (Detox)
476450
test_detox_end_to_end:
477451
<<: *macos_defaults
@@ -738,8 +712,6 @@ workflows:
738712
- checkout_code
739713

740714
# Tooling Compatibility Checks
741-
- test_objc_xcode10:
742-
filters: *filter-ignore-gh-pages
743715
- test_node10:
744716
filters: *filter-ignore-gh-pages
745717

scripts/objc-test-ios.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cd "$ROOT"
2121
export TEST_NAME="iOS"
2222
export SCHEME="RNTester"
2323
export SDK="iphonesimulator"
24-
export DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=11.4"
24+
export DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=12.1"
2525

2626
# If there's a "test" argument, pass it to the test script.
2727
. ./scripts/objc-test.sh $1

scripts/objc-test-tvos.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ cd "$ROOT"
2121
export TEST_NAME="tvOS"
2222
export SCHEME="RNTester-tvOS"
2323
export SDK="appletvsimulator"
24-
export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=11.4"
24+
export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=12.1"
2525

2626
# If there's a "test" argument, pass it to the test script.
2727
. ./scripts/objc-test.sh $1
28-

0 commit comments

Comments
 (0)