Skip to content

Commit 4b4439d

Browse files
authored
Merge pull request #2339 from HuiSF/feat/next-release-storage
chore(storage): merge storage feature branch into next-release
2 parents bde72ab + 4a4edef commit 4b4439d

File tree

570 files changed

+68188
-5041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

570 files changed

+68188
-5041
lines changed

.github/workflows/amplify_integration_tests.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Amplify Integration Tests
22
on:
33
push:
4-
branches: [main, next, stable, feat/*]
4+
branches: [main, next, stable, feat/**]
55
schedule:
66
# 6am pacific time daily, only runs on default branch
77
- cron: '0 13 * * *'
@@ -24,8 +24,7 @@ jobs:
2424
- "amplify_api_example"
2525
- "amplify_auth_cognito_example"
2626
- "amplify_datastore_example"
27-
# TODO(ragingsquirrel3): figure out why this times out
28-
# - "amplify_storage_s3_example"
27+
- "amplify_storage_s3_example"
2928
steps:
3029
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
3130
with:
@@ -106,6 +105,7 @@ jobs:
106105
scope:
107106
- "amplify_api_example"
108107
- "amplify_auth_cognito_example"
108+
- "amplify_storage_s3_example"
109109
steps:
110110
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
111111
with:
@@ -140,6 +140,7 @@ jobs:
140140
matrix:
141141
scope:
142142
- "amplify_auth_cognito_example"
143+
- "amplify_storage_s3_example"
143144
steps:
144145
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
145146
with:
@@ -172,6 +173,7 @@ jobs:
172173
matrix:
173174
scope:
174175
- "amplify_auth_cognito_example"
176+
- "amplify_storage_s3_example"
175177
steps:
176178
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0
177179
with:

.github/workflows/build.yml

Lines changed: 29 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/lint.yml

Lines changed: 32 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)