Skip to content

Commit 674292c

Browse files
authored
Merge branch 'main' into fix/metametric-scroll-issue
2 parents f5b93d6 + a7132ae commit 674292c

File tree

281 files changed

+2546
-1152
lines changed

Some content is hidden

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

281 files changed

+2546
-1152
lines changed

.github/workflows/fitness-functions.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/repository-health-checks.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
uses: MetaMask/action-checkout-and-setup@v1
1717
with:
1818
is-high-risk-environment: false
19+
fetch-depth: 0 # This is needed to checkout all branches
1920
skip-allow-scripts: true
2021
use-yarn-hydrate: true
2122

@@ -62,3 +63,16 @@ jobs:
6263
echo "::error::Working tree dirty."
6364
exit 1
6465
fi
66+
67+
- name: Run fitness functions
68+
if: ${{ !cancelled() && github.event_name == 'pull_request'}}
69+
env:
70+
BASE_REF: ${{ github.event.pull_request.base.ref }}
71+
run: |
72+
# The following command generates a diff of changes between the common
73+
# ancestor of $BASE_REF and HEAD, and the current commit (HEAD), for
74+
# files in the current directory and its subdirectories. The output is
75+
# then saved to a file called "diff".
76+
git diff "$(git merge-base "origin/$BASE_REF" HEAD)" HEAD -- . > ./diff
77+
78+
yarn fitness-functions ci ./diff

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env sh
22
. "$(dirname -- "$0")/_/husky.sh"
33

4-
npm run fitness-functions -- "pre-commit-hook"
4+
yarn fitness-functions pre-commit-hook

app/_locales/en/messages.json

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

app/_locales/en_GB/messages.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"permissions": ["sidePanel"],
3+
"side_panel": {
4+
"default_path": "sidepanel.html"
5+
}
6+
}

0 commit comments

Comments
 (0)