Skip to content

Commit

Permalink
chore: Merge next/main into main (#12454)
Browse files Browse the repository at this point in the history
  • Loading branch information
jimblanc authored Oct 27, 2023
2 parents 7a4ef01 + 798c540 commit af23a19
Show file tree
Hide file tree
Showing 2,428 changed files with 90,169 additions and 125,995 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/packages/api @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/api-graphql @aws-amplify/amplify-data
/packages/api-rest @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/aws-amplify-react-native @aws-amplify/amplify-js @aws-amplify/amplify-ui
/packages/core @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/datastore @aws-amplify/amplify-data
/packages/datastore-storage-adapter @aws-amplify/amplify-data
Expand Down
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/1.bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,16 @@ body:
| ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
| `amazon-cognito-identity-js` | [![version](https://img.shields.io/npm/v/amazon-cognito-identity-js/latest.svg)](https://www.npmjs.com/package/amazon-cognito-identity-js) |
| `aws-amplify` | [![version](https://img.shields.io/npm/v/aws-amplify/latest.svg)](https://www.npmjs.com/package/aws-amplify) |
| `aws-amplify-react-native` | [![version](https://img.shields.io/npm/v/aws-amplify-react-native/latest.svg)](https://www.npmjs.com/package/aws-amplify-react-native) |
| `@aws-amplify/analytics` | [![version](https://img.shields.io/npm/v/@aws-amplify/analytics/latest.svg)](https://www.npmjs.com/package/@aws-amplify/analytics) |
| `@aws-amplify/api` | [![version](https://img.shields.io/npm/v/@aws-amplify/api/latest.svg)](https://www.npmjs.com/package/@aws-amplify/api) |
| `@aws-amplify/api-graphql` | [![version](https://img.shields.io/npm/v/@aws-amplify/api-graphql/latest.svg)](https://www.npmjs.com/package/@aws-amplify/api-graphql) |
| `@aws-amplify/api-rest` | [![version](https://img.shields.io/npm/v/@aws-amplify/api-rest/latest.svg)](https://www.npmjs.com/package/@aws-amplify/api-rest) |
| `@aws-amplify/auth` | [![version](https://img.shields.io/npm/v/@aws-amplify/auth/latest.svg)](https://www.npmjs.com/package/@aws-amplify/auth) |
| `@aws-amplify/cache` | [![version](https://img.shields.io/npm/v/@aws-amplify/cache/latest.svg)](https://www.npmjs.com/package/@aws-amplify/cache) |
| `@aws-amplify/core` | [![version](https://img.shields.io/npm/v/@aws-amplify/core/latest.svg)](https://www.npmjs.com/package/@aws-amplify/core) |
| `@aws-amplify/datastore` | [![version](https://img.shields.io/npm/v/@aws-amplify/datastore/latest.svg)](https://www.npmjs.com/package/@aws-amplify/datastore) |
| `@aws-amplify/interactions` | [![version](https://img.shields.io/npm/v/@aws-amplify/interactions/latest.svg)](https://www.npmjs.com/package/@aws-amplify/interactions) |
| `@aws-amplify/predictions` | [![version](https://img.shields.io/npm/v/@aws-amplify/predictions/latest.svg)](https://www.npmjs.com/package/@aws-amplify/predictions) |
| `@aws-amplify/pubsub` | [![version](https://img.shields.io/npm/v/@aws-amplify/pubsub/latest.svg)](https://www.npmjs.com/package/@aws-amplify/pubsub) |
| `@aws-amplify/pushnotification` | [![version](https://img.shields.io/npm/v/@aws-amplify/pushnotification/latest.svg)](https://www.npmjs.com/package/@aws-amplify/pushnotification) |
| `@aws-amplify/storage` | [![version](https://img.shields.io/npm/v/@aws-amplify/storage/latest.svg)](https://www.npmjs.com/package/@aws-amplify/storage) |
</details>
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-samples-staging/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ runs:
env:
BRANCH: ${{ github.ref_name }}
run: |
if git ls-remote origin $BRANCH | grep -q refs/heads/next/$BRANCH$; then
if git ls-remote --exit-code --heads origin $BRANCH >/dev/null 2>&1; then
# Branch exists, checkout and echo success message
git fetch origin $BRANCH
git checkout $BRANCH
Expand Down
20 changes: 0 additions & 20 deletions .github/canary-config/canary-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,20 +264,6 @@ tests:
sample_name: [credentials-auth]
spec: credentials-auth
browser: *minimal_browser_list
- test_name: integ_react_amazon_cognito_identity_js_cookie_storage
desc: 'amazon-cognito-identity-js-cookie-storage'
framework: react
category: auth
sample_name: [amazon-cognito-identity-js-cookie-storage]
spec: amazon-cognito-identity-js-cookie-storage
browser: *minimal_browser_list
- test_name: integ_react_amazon_cognito_identity_js
desc: 'amazon-cognito-identity-js'
framework: react
category: auth
sample_name: [amazon-cognito-identity-js]
spec: amazon-cognito-identity-js
browser: *minimal_browser_list
- test_name: integ_react_device_tracking
desc: 'cognito-device-tracking'
framework: react
Expand Down Expand Up @@ -321,9 +307,3 @@ tests:
sample_name: [auth-ssr]
spec: auth-ssr
browser: *minimal_browser_list
- test_name: integ_node_amazon_cognito_identity_js
desc: 'amazon-cognito-identity-js'
framework: node
category: auth
sample_name: [amazon-cognito-identity-js]
build_type: dev
1 change: 0 additions & 1 deletion .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
paths-ignore:
- docs
- packages/aws-amplify-react-native/docs
7 changes: 5 additions & 2 deletions .github/integ-config/detox-integ-all.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
- test_name: 'integ_rn_ios_storage'
working_directory: amplify-js-samples-staging/samples/react-native/storage/StorageApp
timeout_minutes: 120
- test_name: 'integ_rn_ios_storage_multipart_progress'
working_directory: amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
timeout_minutes: 120
- test_name: 'integ_rn_ios_device_tracking'
working_directory: amplify-js-samples-staging/samples/react-native/auth/deviceTracking
timeout_minutes: 120
# - test_name: 'integ_rn_ios_datastore_sqlite_adapter'
# working_directory: ~/amplify-js-samples-staging/samples/react-native/datastore/SQLiteAdapter
- test_name: 'integ_rn_ios_datastore_sqlite_adapter'
working_directory: amplify-js-samples-staging/samples/react-native/datastore/SQLiteAdapter
timeout_minutes: 120
# - test_name: 'integ_rn_android_storage'
# working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
# - test_name: 'integ_rn_android_storage_multipart_progress'
Expand Down
9 changes: 5 additions & 4 deletions .github/integ-config/integ-all-headless.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
tests:
[]
# integ_auth_test_cypress_no_ui
- test_name: 'Token revocation'
category: 'auth'
spec: 'token-revocation'
is_headless: true
# - test_name: 'Token revocation'
# category: 'auth'
# spec: 'token-revocation'
# is_headless: true
Loading

0 comments on commit af23a19

Please sign in to comment.