Skip to content

Commit d0140df

Browse files
authored
Merge branch 'main' into sirtimid/refactor-kernel-store
2 parents 1c6da4b + f2ca7ce commit d0140df

File tree

3 files changed

+43
-6
lines changed

3 files changed

+43
-6
lines changed

.github/workflows/lint-build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
yarn build-release
150150
cd -
151151
- run: yarn build
152-
- run: yarn run test
152+
- run: yarn test:ci
153153
- name: Require clean working directory
154154
shell: bash
155155
run: |
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: MetaMask Security Code Scanner
2+
3+
on:
4+
push:
5+
branches: ['main']
6+
pull_request:
7+
branches: ['main']
8+
workflow_call:
9+
secrets:
10+
SECURITY_SCAN_METRICS_TOKEN:
11+
required: false
12+
APPSEC_BOT_SLACK_WEBHOOK:
13+
required: false
14+
workflow_dispatch:
15+
16+
jobs:
17+
run-security-scan:
18+
name: Run security scan
19+
runs-on: ubuntu-latest
20+
permissions:
21+
actions: read
22+
contents: read
23+
security-events: write
24+
steps:
25+
- name: Analyze code
26+
uses: MetaMask/action-security-code-scanner@v1
27+
with:
28+
repo: ${{ github.repository }}
29+
paths_ignored: |
30+
'**/*.test.js*'
31+
'**/*.test.ts*'
32+
'**/docs/'
33+
'**/playwright.config.ts'
34+
'**/test/'
35+
'**/vitest.config*.ts'
36+
node_modules
37+
project_metrics_token: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
38+
slack_webhook: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@
3131
"postinstall": "simple-git-hooks",
3232
"prepack": "./scripts/prepack.sh",
3333
"pretest": "bash scripts/reset-coverage-thresholds.sh",
34-
"posttest": "printf '\\n' >> vitest.config.ts",
35-
"test": "yarn pretest && vitest run && yarn posttest",
36-
"test:dev": "yarn pretest && vitest run --mode development && yarn posttest",
37-
"test:clean": "yarn test --no-cache --coverage.clean",
34+
"test": "yarn pretest && vitest run",
35+
"test:ci": "vitest run",
36+
"test:dev": "yarn test --mode development",
3837
"test:e2e": "yarn workspaces foreach --all run test:e2e",
3938
"test:e2e:ci": "yarn workspaces foreach --all run test:e2e:ci",
40-
"test:verbose": "yarn pretest && yarn test --reporter verbose && yarn posttest",
39+
"test:verbose": "yarn test --reporter verbose",
4140
"test:watch": "vitest",
4241
"why:batch": "./scripts/why-batch.sh"
4342
},

0 commit comments

Comments
 (0)