Skip to content

[CI] Reënable iOS and tvOS tests #18171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hramos wants to merge 9 commits into from
Closed

[CI] Reënable iOS and tvOS tests #18171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb8505c
Re-enable iOS tests
hramos Feb 27, 2018
bb4855c
Reenable tvOS tests
hramos Feb 27, 2018
ac408d7
Install Watchman
hramos Feb 28, 2018
2c069dd
separate checkout and yarn
hramos Feb 28, 2018
67f7f02
merge checkout/yarn
hramos Feb 28, 2018
a73a613
Re-enable iOS
hramos Mar 2, 2018
9a02534
Stop uploading test results as artifacts, as this is handled by store…
hramos Mar 2, 2018
6c6888d
Rebase
hramos Mar 2, 2018
f8db111
Stop "building" the iOS and tvOS apps, as tests already cover this.
hramos Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 18 additions & 69 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,27 +211,27 @@ aliases:
mkdir -p ~/react-native/reports/junit/

- &build-objc-ios-test-app
name: Build Objective-C iOS Test App
name: Build iOS Test App
command: ./scripts/objc-test-ios.sh

- &run-objc-ios-tests
name: Objective-C iOS Test Suite
name: iOS Test Suite
command: ./scripts/objc-test-ios.sh test

- &build-objc-tvos-test-app
name: Build Objective-C tvOS Test App
name: Build tvOS Test App
command: ./scripts/objc-test-tvos.sh

- &run-objc-tvos-tests
name: Objective-C tvOS Test Suite
name: tvOS Test Suite
command: ./scripts/objc-test-tvos.sh test

- &run-objc-ios-e2e-tests
name: Objective-C iOS End-to-End Test Suite
name: iOS End-to-End Test Suite
command: node ./scripts/run-ci-e2e-tests.js --ios --js --retries 3;

- &run-objc-tvos-e2e-tests
name: Objective-C tvOS End-to-End Test Suite
name: tvOS End-to-End Test Suite
command: node ./scripts/run-ci-e2e-tests.js --tvos --js --retries 3;

defaults: &defaults
Expand Down Expand Up @@ -292,8 +292,6 @@ jobs:

- store_test_results:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/yarn.lock

Expand All @@ -308,8 +306,6 @@ jobs:

- store_test_results:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/reports/junit

# Runs JavaScript tests on Node 6
test_javascript_node6_compatibility:
Expand All @@ -328,83 +324,47 @@ jobs:

- store_test_results:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/reports/junit

# Builds iOS test app
build_objc_ios_test_app:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "iPhone 5s (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native

- run: *build-objc-ios-test-app

# Runs unit tests on iOS devices
test_objc_ios:
test_ios:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "iPhone 5s (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native

- run: xcrun instruments -w "iPhone 5s (11.1)" || true
- run: brew install watchman
- run: *run-objc-ios-tests

- store_test_results:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/reports/junit

# Builds tvOS test app
build_objc_tvos_test_app:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "Apple TV 1080p (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native

- run: *build-objc-tvos-test-app

# Runs unit tests on tvOS devices
test_objc_tvos:
test_tvos:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "Apple TV 1080p (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native

- run: xcrun instruments -w "Apple TV 1080p (11.1)" || true
- run: brew install watchman
- run: *run-objc-tvos-tests

- store_test_results:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/reports/junit

# Runs end to end tests
test_objc_ios_e2e:
test_ios_e2e:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "iPhone 5s (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native

- run: xcrun instruments -w "iPhone 5s (11.1)" || true
- run: *run-objc-ios-e2e-tests

- store_test_results:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/reports/junit

# Checks podspec
test_podspec:
Expand Down Expand Up @@ -523,8 +483,6 @@ jobs:
- run: *collect-android-test-results
- store_test_results:
path: ~/react-native/reports/junit
- store_artifacts:
path: ~/react-native/reports/junit


# Analyze pull request and raise any lint/flow issues.
Expand Down Expand Up @@ -604,18 +562,18 @@ workflows:
requires:
- checkout_code

# Build iOS & tvOS test apps
- build_objc_ios_test_app:
# Test iOS & tvOS
- test_ios:
filters: *filter-ignore-gh-pages
requires:
- checkout_code
- build_objc_tvos_test_app:
- test_tvos:
filters: *filter-ignore-gh-pages
requires:
- checkout_code

# End-to-end tests
- test_objc_ios_e2e:
- test_ios_e2e:
filters: *filter-ignore-gh-pages
requires:
- checkout_code
Expand Down Expand Up @@ -657,15 +615,6 @@ workflows:

# # The following were DISABLED because they have not run since
# # the migration from Travis, and they have broken since then,
# # Test iOS & tvOS
# - test_objc_ios:
# filters: *filter-ignore-gh-pages
# requires:
# - checkout_code
# - test_objc_tvos:
# filters: *filter-ignore-gh-pages
# requires:
# - checkout_code
# # CocoaPods
# - test_podspec:
# filters: *filter-ignore-gh-pages
Expand Down
6 changes: 0 additions & 6 deletions scripts/objc-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ curl 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundl
rm temp.bundle

# Run tests
# TODO: We use xcodebuild because xctool would stall when collecting info about
# the tests before running them. Switch back when this issue with xctool has
# been resolved.
xcodebuild \
-project "RNTester/RNTester.xcodeproj" \
-scheme $SCHEME \
Expand All @@ -87,9 +84,6 @@ xcodebuild \
else

# Don't run tests. No need to pass -destination to xcodebuild.
# TODO: We use xcodebuild because xctool would stall when collecting info about
# the tests before running them. Switch back when this issue with xctool has
# been resolved.
xcodebuild \
-project "RNTester/RNTester.xcodeproj" \
-scheme $SCHEME \
Expand Down