Skip to content

Commit

Permalink
Bump RN OSS iOS tests to iOS SDK 12.1, Xcode 10.1
Browse files Browse the repository at this point in the history
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
  • Loading branch information
hramos authored and facebook-github-bot committed Dec 4, 2018
1 parent 424d445 commit 04af674
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 32 deletions.
30 changes: 1 addition & 29 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ android_defaults: &android_defaults
macos_defaults: &macos_defaults
<<: *defaults
macos:
xcode: "9.4.0"
xcode: "10.1.0"

version: 2
jobs:
Expand Down Expand Up @@ -446,32 +446,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
Expand Down Expand Up @@ -738,8 +712,6 @@ workflows:
- checkout_code

# Tooling Compatibility Checks
- test_objc_xcode10:
filters: *filter-ignore-gh-pages
- test_node10:
filters: *filter-ignore-gh-pages

Expand Down
2 changes: 1 addition & 1 deletion scripts/objc-test-ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cd "$ROOT"
export TEST_NAME="iOS"
export SCHEME="RNTester"
export SDK="iphonesimulator"
export DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=11.4"
export DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=12.1"

# If there's a "test" argument, pass it to the test script.
. ./scripts/objc-test.sh $1
3 changes: 1 addition & 2 deletions scripts/objc-test-tvos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ cd "$ROOT"
export TEST_NAME="tvOS"
export SCHEME="RNTester-tvOS"
export SDK="appletvsimulator"
export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=11.4"
export DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=12.1"

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

0 comments on commit 04af674

Please sign in to comment.