Skip to content
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.

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

[Circle] Add disabled tests to CircleCI config, bump Xcode/iOS/tvOS versions #17959

Closed
wants to merge 6 commits into from
Closed
Changes from all commits
Commits
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: 72 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,21 @@ aliases:
command: |
mkdir -p ~/react-native/reports/junit/

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

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

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

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

- &run-objc-ios-e2e-tests
name: Objective-C iOS End-to-End Test Suite
Expand Down Expand Up @@ -245,7 +253,7 @@ android_defaults: &android_defaults
macos_defaults: &macos_defaults
<<: *defaults
macos:
xcode: "9.0"
xcode: "9.2.0"

version: 2
jobs:
Expand Down Expand Up @@ -317,29 +325,53 @@ jobs:
- 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:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "iPhone 5s (10.3.1)" || true
- xcrun instruments -w "iPhone 5s (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native

- run: *run-objc_ios-tests
- 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:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "Apple TV 1080p (10.0)" || true
- xcrun instruments -w "Apple TV 1080p (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native
Expand All @@ -356,7 +388,7 @@ jobs:
<<: *macos_defaults
dependencies:
pre:
- xcrun instruments -w "iPhone 5s (10.3.1)" || true
- xcrun instruments -w "iPhone 5s (11.1)" || true
steps:
- attach_workspace:
at: ~/react-native
Expand All @@ -370,9 +402,7 @@ jobs:

# Checks podspec
test_podspec:
<<: *defaults
macos:
xcode: "9.0"
<<: *macos_defaults
steps:
- attach_workspace:
at: ~/react-native
Expand Down Expand Up @@ -537,7 +567,7 @@ jobs:
workflows:
version: 2

test:
tests:
jobs:

# Checkout repo and run Yarn
Expand Down Expand Up @@ -566,12 +596,12 @@ workflows:
requires:
- checkout_code

# Test iOS & tvOS
- test_objc_ios:
# Build iOS & tvOS test apps
- build_objc_ios_test_app:
filters: *filter-ignore-gh-pages
requires:
- checkout_code
- test_objc_tvos:
- build_objc_tvos_test_app:
filters: *filter-ignore-gh-pages
requires:
- checkout_code
Expand Down Expand Up @@ -610,3 +640,30 @@ workflows:
requires:
- checkout_code
- approve_publish_npm_package

# These tests are flaky or are yet to be fixed. They are placed on their own
# workflow to avoid marking benign PRs as broken.
# To run them, uncomment the entire block and open a PR (do not merge).
# Once a test is fixed, move the test definition to the 'tests' workflow.
# disabled_tests:
# jobs:
# # Checkout repo and run Yarn (pre-req, should succeed)
# - checkout_code:
# filters: *filter-ignore-gh-pages

# # 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
# requires:
# - checkout_code