Skip to content

Commit

Permalink
Merge branch 'main' into type-guards
Browse files Browse the repository at this point in the history
  • Loading branch information
ioanabrooks authored Jan 25, 2023
2 parents 5753ff3 + 3db32f2 commit 5a45b23
Show file tree
Hide file tree
Showing 229 changed files with 1,856 additions and 2,403 deletions.
5 changes: 0 additions & 5 deletions .changeset/nine-ears-think.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/witty-carrots-retire.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/actions/has-changesets/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:
shell: bash
run: |
if (find .changeset -type f -name '*.md' ! -name 'README.md' | grep -q .) ; then
echo "::set-output name=has-changesets::true"
echo "has-changesets=true" >> $GITHUB_OUTPUT
else
echo "::set-output name=has-changesets::false"
echo "has-changesets=false" >> $GITHUB_OUTPUT
fi
23 changes: 17 additions & 6 deletions .github/workflow-samples/tagged-release.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
# Description: This workflow runs unit + e2e tests, then publishes UI packages
# to a custom dist NPM tag of your choice. This is intened to run
# to a custom dist NPM tag of your choice. This is intended to run
# on release branches (e.g. `in-app-messaging/release`).
#
# Triggered by: This runs whenever you push a commit to the specified release branch.
#
# To use: replace <BRANCH> with your release branch name. Replace <TAG> with
# To use: replace <BRANCH> with your release branch name. Replace <TAG> with
# your NPM tag name.

name: Test and Publish / <BRANCH>

on:
# You may change this to `pull_request` if you want to run this on a PRs.
# This can be useful for publishing hotfixes quickly to unblock customers,
# but otherwise, we recommend to use a release branch.
push:
branches: [<BRANCH>]

jobs:
# You can skip tests based on your use case.
# You can skip tests based on your use case.
test:
uses: aws-amplify/amplify-ui/.github/workflows/reusable-e2e.yml@<BRANCH>
with:
commit: ${{ github.sha }}
repository: ${{ github.repository }}
secrets:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} # TODO: Remove this
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} #TODO: Remove this
AWS_ACCESS_KEY_ID_AUTH: ${{ secrets.AWS_ACCESS_KEY_ID_AUTH }}
AWS_SECRET_ACCESS_KEY_AUTH: ${{ secrets.AWS_SECRET_ACCESS_KEY_AUTH }}
AWS_ACCESS_KEY_ID_DATASTORE: ${{ secrets.AWS_ACCESS_KEY_ID_DATASTORE }}
AWS_SECRET_ACCESS_KEY_DATASTORE: ${{ secrets.AWS_SECRET_ACCESS_KEY_DATASTORE }}
AWS_ACCESS_KEY_ID_GEO: ${{ secrets.AWS_ACCESS_KEY_ID_GEO }}
AWS_SECRET_ACCESS_KEY_GEO: ${{ secrets.AWS_SECRET_ACCESS_KEY_GEO }}
AWS_ACCESS_KEY_ID_STORAGE: ${{ secrets.AWS_ACCESS_KEY_ID_STORAGE }}
AWS_SECRET_ACCESS_KEY_STORAGE: ${{ secrets.AWS_SECRET_ACCESS_KEY_STORAGE }}
DOMAIN: ${{ secrets.DOMAIN }}
PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
USERNAME: ${{ secrets.USERNAME }}
Expand All @@ -34,7 +45,7 @@ jobs:
DOCSEARCH_DOCS_INDEX_NAME: ${{ secrets.DOCSEARCH_DOCS_INDEX_NAME }}

publish:
needs: test
needs: test # remove this line if you're skipping test job.
uses: ./.github/workflows/reusable-tagged-publish.yml
with:
dist-tag: <TAG>
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-and-runtime-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Build and Runtime Test

on:
schedule:
- cron: '*/15 * * * *' # Run every minutes
- cron: '*/15 * * * *' # Run every 15 minutes

jobs:
build:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
run: yarn global add @aws-amplify/cli
- name: Get CLI versions
id: cli-version
run: echo "::set-output name=version::$(amplify --version)"
run: echo "version=$(amplify --version)" >> $GITHUB_OUTPUT
- name: Create or restore environments cache
id: environments-cache
uses: actions/cache@v3
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
uses: actions/upload-artifact@v3
if: ${{ failure() && steps.e2e.outcome != 'success' }}
with:
name: canary-cypress-error-{{ matrix.path }}
name: canary-cypress-error-${{ matrix.path }}
path: |
canary/e2e/cypress/videos/**
canary/e2e/cypress/screenshots/**
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/publish-fileuploader.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: yarn global add @aws-amplify/cli
- name: Get CLI versions
id: cli-version
run: echo "::set-output name=version::$(amplify --version)"
run: echo "version=$(amplify --version)" >> $GITHUB_OUTPUT
- name: Create or restore environments cache
id: environments-cache
uses: actions/cache@v3
Expand Down
83 changes: 0 additions & 83 deletions .github/workflows/publish-next-release.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/publish-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
run: yarn global add @aws-amplify/cli
- name: Get CLI versions
id: cli-version
run: echo "::set-output name=version::$(amplify --version)"
run: echo "version=$(amplify --version)" >> $GITHUB_OUTPUT
- name: Pull down AWS environments
if: steps.environments-cache.outputs.cache-hit != 'true'
run: yarn environments auth pull:email
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
run: yarn global add @aws-amplify/cli
- name: Get CLI versions
id: cli-version
run: echo "::set-output name=version::$(amplify --version)"
run: echo "version=$(amplify --version)" >> $GITHUB_OUTPUT
- name: Create or restore environments cache
id: environments-cache
uses: actions/cache@v3
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/publish-rna.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/reusable-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ jobs:

- name: Get CLI versions
id: cli-version
run: echo "::set-output name=version::$(amplify --version)"
run: echo "version=$(amplify --version)" >> $GITHUB_OUTPUT

- name: Create or restore environments cache
id: environments-cache
Expand Down
69 changes: 0 additions & 69 deletions .github/workflows/test-fileuploader-release-prs.yml

This file was deleted.

69 changes: 0 additions & 69 deletions .github/workflows/test-next-release-prs.yml

This file was deleted.

Loading

0 comments on commit 5a45b23

Please sign in to comment.