-
Notifications
You must be signed in to change notification settings - Fork 5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 27742-sentry-error-transactionscontroller-ca…
…n-only-call-updateeditableparams-on-an-unapproved-transaction
- Loading branch information
Showing
639 changed files
with
40,658 additions
and
29,016 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
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
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,8 +1,23 @@ | ||
| import { fetchManifestFlagsFromPRAndGit } from '../../development/lib/get-manifest-flag'; | ||
| import { filterE2eChangedFiles } from '../../test/e2e/changedFilesUtil'; | ||
|
|
||
| const changedOrNewTests = filterE2eChangedFiles(); | ||
| fetchManifestFlagsFromPRAndGit().then((manifestFlags) => { | ||
| let timeout; | ||
|
|
||
| // 20 minutes, plus 3 minutes for every changed file, up to a maximum of 30 minutes | ||
| const extraTime = Math.min(20 + changedOrNewTests.length * 3, 30); | ||
| if (manifestFlags.circleci?.timeoutMinutes) { | ||
| timeout = manifestFlags.circleci?.timeoutMinutes; | ||
| } else { | ||
| const changedOrNewTests = filterE2eChangedFiles(); | ||
|
|
||
| console.log(extraTime); | ||
| // 20 minutes, plus 3 minutes for every changed file, up to a maximum of 30 minutes | ||
| timeout = Math.min(20 + changedOrNewTests.length * 3, 30); | ||
| } | ||
|
|
||
| // If this is the Merge Queue, add 10 minutes | ||
| if (process.env.CIRCLE_BRANCH?.startsWith('gh-readonly-queue')) { | ||
| timeout += 10; | ||
| } | ||
|
|
||
| // This is an essential log, that feeds into a bash script | ||
| console.log(timeout); | ||
| }); |
Validating CODEOWNERS rules …
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
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
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
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
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
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
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 |
|---|---|---|
|
|
@@ -3,6 +3,9 @@ | |
| # actions that may result in code from that branch being executed | ||
| # such as installing dependencies or running build scripts. | ||
|
|
||
| # For security reasons, this file always uses the latest version from the default branch. | ||
| # Changes made in feature branches or forks will not take effect until they are merged. | ||
|
|
||
| name: SonarCloud | ||
|
|
||
| on: | ||
|
|
@@ -17,9 +20,9 @@ permissions: | |
|
|
||
| jobs: | ||
| sonarcloud: | ||
| # Only scan code from non-forked repositories that have passed the tests | ||
| # Only scan code from non-forked repositories that have completed successfully using the push and pull_request events | ||
| # This will skip scanning the code for forks, but will run for the main repository on PRs from forks | ||
| if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.repository.fork == false }} | ||
| if: ${{ github.event.workflow_run.conclusion == 'success' && contains(fromJSON('["push", "pull_request"]'), github.event.workflow_run.event) && !github.event.workflow_run.repository.fork }} | ||
| name: SonarCloud | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
|
|
@@ -50,6 +53,23 @@ jobs: | |
| fi | ||
| echo "$sonar_project_properties" > sonar-project.properties | ||
| - name: Update sonar-project.properties with branch information | ||
| env: | ||
| EVENT: ${{ github.event.workflow_run.event }} | ||
| HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} | ||
| BASE_BRANCH: ${{ github.event.workflow_run.pull_requests[0].base.ref || '' }} | ||
| PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number || '' }} | ||
| run: | | ||
| if [ "$EVENT" == "pull_request" ]; then | ||
| { | ||
| echo "sonar.pullrequest.branch=$HEAD_BRANCH" | ||
| echo "sonar.pullrequest.base=$BASE_BRANCH" | ||
| echo "sonar.pullrequest.key=$PR_NUMBER" | ||
| } >> sonar-project.properties | ||
| else | ||
| echo "sonar.branch.name=$HEAD_BRANCH" >> sonar-project.properties | ||
| fi | ||
| - name: SonarCloud Scan | ||
| # This is SonarSource/[email protected] | ||
| uses: SonarSource/sonarcloud-github-action@4b4d7634dab97dcee0b75763a54a6dc92a9e6bc1 | ||
|
|
||
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,35 @@ | ||
| name: Wait for CircleCI workflow status | ||
|
|
||
| on: | ||
| workflow_call: | ||
|
|
||
| jobs: | ||
| wait-for-circleci-workflow-status: | ||
| name: Wait for CircleCI workflow status | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Wait for CircleCI workflow status | ||
| env: | ||
| OWNER: ${{ github.repository_owner }} | ||
| REPOSITORY: ${{ github.event.repository.name }} | ||
| BRANCH: ${{ github.head_ref || github.ref_name }} | ||
| # For a `push` event, the HEAD commit hash is `github.sha`. | ||
| # For a `pull_request` event, `github.sha` is instead the base branch commit hash. The | ||
| # HEAD commit hash is `pull_request.head.sha`. | ||
| HEAD_COMMIT_HASH: ${{ github.event.pull_request.head.sha || github.sha }} | ||
| run: | | ||
| pipeline_id=$(curl --silent "https://circleci.com/api/v2/project/gh/$OWNER/$REPOSITORY/pipeline?branch=$BRANCH" | jq -r ".items | map(select(.vcs.revision == \"${HEAD_COMMIT_HASH}\" )) | first | .id") | ||
| echo "Waiting for pipeline '${pipeline_id}' for commit hash '${HEAD_COMMIT_HASH}'" | ||
| workflow_status=$(curl --silent "https://circleci.com/api/v2/pipeline/$pipeline_id/workflow" | jq -r ".items[0].status") | ||
| if [ "$workflow_status" == "running" ]; then | ||
| while [ "$workflow_status" == "running" ]; do | ||
| sleep 30 | ||
| workflow_status=$(curl --silent "https://circleci.com/api/v2/pipeline/$pipeline_id/workflow" | jq -r ".items[0].status") | ||
| done | ||
| fi | ||
| if [ "$workflow_status" != "success" ]; then | ||
| echo "::error::Workflow status is '$workflow_status'. Exiting with error." | ||
| exit 1 | ||
| fi |
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,18 @@ | ||
| /* Fixes for any styles that are not compatible with Storybook */ | ||
|
|
||
| .create-snap-account-page, .remove-snap-account-page, .snap-ui-renderer { | ||
| width: 100% !important; | ||
| } | ||
|
|
||
| .snap-ui-renderer__footer-centered { | ||
| position: initial !important; | ||
| margin-top: auto !important; | ||
| } | ||
|
|
||
| .snap-ui-renderer__container { | ||
| padding-bottom: 0 !important; | ||
| } | ||
|
|
||
| .snap-ui-renderer__panel { | ||
| overflow-y: auto !important; | ||
| } |
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
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
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.