This repository has been archived by the owner on Dec 6, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1119 from aws-solutions/release/v2.0.0
feat: Release/v2.0.0
- Loading branch information
Showing
1,178 changed files
with
95,025 additions
and
35,902 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,31 @@ | ||
| * @awslabs/aws-ma-foundation | ||
| * @aws-solutions/sb-solution-spark-developers | ||
|
|
||
| rush.json @aws-solutions/sb-solution-spark-developers | ||
| common/config/rush/pnpm-lock.yaml @aws-solutions/sb-solution-spark-developers | ||
| .viperlightignore @aws-solutions/sb-solution-spark-developers | ||
|
|
||
| solutions/swb-ui @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/swb-ui @aws-solutions/sb-ma-swb | ||
| solutions/swb-reference @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/swb-reference @aws-solutions/sb-ma-swb | ||
| solutions/swb-app @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/swb-app @aws-solutions/sb-ma-swb | ||
| workbench-core/base @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/workbench-core-base @aws-solutions/sb-ma-swb | ||
| workbench-core/environments @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/workbench-core-environments @aws-solutions/sb-ma-swb | ||
| workbench-core/environments-ui @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/workbench-core-environments-ui @aws-solutions/sb-ma-swb | ||
| workbench-core/accounts @aws-solutions/sb-ma-swb | ||
| workbench-core/accounts-ui @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/workbench-core-accounts-ui @aws-solutions/sb-ma-swb | ||
| workbench-core/datasets-ui @aws-solutions/sb-ma-swb | ||
| common/changes/@aws/workbench-core-datasets-ui @aws-solutions/sb-ma-swb | ||
|
|
||
| common/config/rush/browser-approved-packages.json | ||
| common/config/rush/nonbrowser-approved-packages.json | ||
| common/config/rush/pnpm-lock.yaml | ||
| **/cache/config.json | ||
| .gitallowed | ||
| .gitattributes | ||
| .gitignore | ||
| common/changes/ | ||
| solutions/swb-ui @awslabs/aws-ma-swb | ||
| common/changes/@aws/swb-ui @awslabs/aws-ma-swb | ||
| solutions/swb-reference @awslabs/aws-ma-swb | ||
| common/changes/@aws/swb-reference @awslabs/aws-ma-swb | ||
| solutions/swb-app @awslabs/aws-ma-swb | ||
| common/changes/@aws/swb-app @awslabs/aws-ma-swb | ||
| workbench-core/base @awslabs/aws-ma-swb | ||
| common/changes/@aws/workbench-core-base @awslabs/aws-ma-swb | ||
| workbench-core/environments @awslabs/aws-ma-swb | ||
| common/changes/@aws/workbench-core-environments @awslabs/aws-ma-swb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,10 +9,10 @@ description: Generic base action used by workflows - Cache rush and pnpm; rush i | |
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Use Node.js 14.x | ||
| - name: Use Node.js 18.x | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: '14.x' | ||
| node-version: '18.x' | ||
|
|
||
| - name: Cache Rush | ||
| uses: actions/cache@v3 | ||
|
|
@@ -30,6 +30,7 @@ runs: | |
| with: | ||
| path: | | ||
| common/temp/pnpm-store | ||
| ~/.cache/Cypress | ||
| key: ${{ runner.os }}-pnpm-${{ hashFiles('common/config/rush/pnpm-lock.yaml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-pnpm- | ||
|
|
@@ -38,12 +39,11 @@ runs: | |
| - name: install pnpm | ||
| uses: pnpm/[email protected] | ||
| with: | ||
| version: 6.32 | ||
| version: 7.13.0 | ||
|
|
||
| - name: Install dependecies | ||
| shell: bash | ||
| run: node common/scripts/install-run-rush.js install | ||
|
|
||
| - name: Rush check | ||
| shell: bash | ||
| run: node common/scripts/install-run-rush.js check | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| # | ||
| # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
||
| name: Enable Branch Protection Action | ||
| description: Enable Branch Protection | ||
| inputs: | ||
| merge_token: | ||
| description: "MERGE TOKEN" | ||
| required: true | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: 'Construct required_pull_request_reviews object' | ||
| id: pr_review | ||
| shell: bash | ||
| run: | | ||
| required_pr_reviews_json="$(cat <<EOF | ||
| { "require_code_owner_reviews": true, "dismiss_stale_reviews": true, "required_approving_review_count": 1 } | ||
| EOF | ||
| )" | ||
| echo "::set-output name=required_pr_reviews::${required_pr_reviews_json}" | ||
| - name: 'Construct required_status_checks object' | ||
| id: status_check | ||
| shell: bash | ||
| run: | | ||
| require_status_check_json="$(cat <<EOF | ||
| { "strict": true, "contexts": ['Only create PR against develop/release branch, not main branch', 'Only create PR against develop/release branch, not stage branch', 'Scan for secrets', 'Run cfn-nag scan', 'Validate PR title', 'build-and-test', 'license-checker', 'pnpm-audit', 'run-rush-change-verify', 'check-license-header', 'Viperlight scan'] } | ||
| EOF | ||
| )" | ||
| echo "::set-output name=require_status_check::${require_status_check_json}" | ||
| - name: 'Construct restrictions object' | ||
| id: gh_restrictions | ||
| shell: bash | ||
| run: | | ||
| restrictions_json="$(cat <<EOF | ||
| null | ||
| EOF | ||
| )" | ||
| echo "::set-output name=restrictions::${restrictions_json}" | ||
| - name: Enable branch protection on ${{ github.ref_name }} | ||
| uses: octokit/[email protected] | ||
| with: | ||
| route: PUT /repos/{owner}/{repo}/branches/{branch}/protection | ||
| owner: aws-solutions | ||
| repo: research-service-workbench-on-aws | ||
| branch: ${{ github.ref_name }} | ||
| enforce_admins: true | ||
| required_pull_request_reviews: '${{ steps.pr_review.outputs.required_pr_reviews }}' | ||
| required_status_checks: '${{ steps.status_check.outputs.require_status_check }}' | ||
| restrictions: '${{ steps.gh_restrictions.outputs.restrictions }}' | ||
| env: | ||
| GITHUB_TOKEN: ${{ inputs.merge_token }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # | ||
| # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
||
| name: Slack Notification | ||
| description: Action to send slack notification on failure | ||
| inputs: | ||
| slack_webhook_url: | ||
| description: "Slack WebHook URL" | ||
| required: true | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Slack Notification | ||
| shell: bash | ||
| run: | | ||
| curl -X POST -H 'Content-type: application/json' --data '{"text":"\nSTATUS: \"${{ job.status }}\" \nWORKFLOW_NAME: \"${{ github.workflow }}\" \nJOB: \"${{ github.job }}\" \nJOB_URL: \"${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\" "}' ${{ inputs.slack_webhook_url }} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| name: automerge-relese-pr-to-develop | ||
| on: | ||
| pull_request: | ||
| types: | ||
| - labeled | ||
| branches: | ||
| - 'develop' | ||
|
|
||
| jobs: | ||
| automerge-relese-pr-to-develop: | ||
| runs-on: ubuntu-20.04 | ||
| if: contains(github.event.pull_request.labels.*.name, 'automerge-enabled') && contains(github.event.pull_request.labels.*.name, 'auto-release-pr-to-develop') | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| token: ${{ secrets.MERGE_TOKEN }} | ||
| fetch-depth: 0 | ||
| - name: enable merge commits and automerge | ||
| uses: octokit/[email protected] | ||
| with: | ||
| route: PATCH /repos/{owner}/{repo} | ||
| owner: aws-solutions | ||
| repo: research-service-workbench-on-aws | ||
| allow_merge_commit: true | ||
| allow_auto_merge: true | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.MERGE_TOKEN }} | ||
| - name: Enable Pull Request Automerge | ||
| uses: peter-evans/enable-pull-request-automerge@v3 | ||
| with: | ||
| pull-request-number: ${{ github.event.pull_request.number }} | ||
| merge-method: merge | ||
| token: ${{ secrets.MERGE_TOKEN }} | ||
| - name: disable merge commits and automerge | ||
| if: always() | ||
| uses: octokit/[email protected] | ||
| with: | ||
| route: PATCH /repos/{owner}/{repo} | ||
| owner: aws-solutions | ||
| repo: research-service-workbench-on-aws | ||
| allow_merge_commit: false | ||
| allow_auto_merge: false | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.MERGE_TOKEN }} | ||
| - name: remove automerge label | ||
| if: failure() | ||
| uses: actions-ecosystem/action-remove-labels@v1 | ||
| with: | ||
| labels: automerge-enabled | ||
| github_token: ${{ secrets.MERGE_TOKEN }} | ||
| number: ${{ github.event.pull_request.number }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.