Skip to content

Commit

Permalink
Updating config.yml to mitigate circle CI pipeline failures from outd…
Browse files Browse the repository at this point in the history
…ated Xcode image (aws-amplify#10158)

* updating config.yml for testing changes to staging

* removing android integ tests for now

* Update config.yml

* removing code used for testing

Co-authored-by: Francisco Rodriguez <frodriguez.cs@gmail.com>
  • Loading branch information
katiegoines and elorzafe authored Aug 9, 2022
1 parent 88a9ec9 commit 850788c
Showing 1 changed file with 27 additions and 33 deletions.
60 changes: 27 additions & 33 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ executors:
xcode: 13.2.1
resource_class: large

# For RN apps that need to be upgraded before using latest iOS/macOS
macos-executor-legacy:
macos:
xcode: 11.5.0
resource_class: large

test_env_vars: &test_env_vars
environment:
NPM_REGISTRY: http://0.0.0.0:4873/
Expand Down Expand Up @@ -1008,7 +1002,7 @@ jobs:
spec: delete-user
browser: << parameters.browser >>
integ_rn_ios_storage:
executor: macos-executor-legacy
executor: macos-executor
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
steps:
Expand All @@ -1028,19 +1022,19 @@ jobs:
steps:
- integ_test_rn_ios

integ_rn_android_storage:
executor: macos-executor-legacy
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
steps:
- integ_test_rn_android
# integ_rn_android_storage:
# executor: macos-executor
# <<: *test_env_vars
# working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
# steps:
# - integ_test_rn_android

integ_rn_android_storage_multipart_progress:
executor: macos-executor-legacy
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
steps:
- integ_test_rn_android
# integ_rn_android_storage_multipart_progress:
# executor: macos-executor
# <<: *test_env_vars
# working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
# steps:
# - integ_test_rn_android

integ_rn_ios_datastore_sqlite_adapter:
executor: macos-executor
Expand Down Expand Up @@ -1554,18 +1548,18 @@ workflows:
- build
filters:
<<: *releasable_branches
- integ_rn_android_storage:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
- integ_rn_android_storage_multipart_progress:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
# - integ_rn_android_storage:
# requires:
# - integ_setup
# - build
# filters:
# <<: *releasable_branches
# - integ_rn_android_storage_multipart_progress:
# requires:
# - integ_setup
# - build
# filters:
# <<: *releasable_branches
- integ_rn_ios_datastore_sqlite_adapter:
requires:
- integ_setup
Expand Down Expand Up @@ -1654,9 +1648,9 @@ workflows:
- integ_vue_auth
- integ_rn_ios_storage
- integ_rn_ios_storage_multipart_progress
- integ_rn_android_storage_multipart_progress
# - integ_rn_android_storage_multipart_progress
- integ_rn_ios_push_notifications
- integ_rn_android_storage
# - integ_rn_android_storage
- integ_rn_ios_datastore_sqlite_adapter
- integ_datastore_auth
- integ_datastore_auth_v2
Expand Down

0 comments on commit 850788c

Please sign in to comment.