Skip to content

Commit

Permalink
Merge branch 'main' into caip25-permission-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
jiexi committed Dec 20, 2024
2 parents 9657527 + a02799d commit 0ab7368
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 43 deletions.
43 changes: 0 additions & 43 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,6 @@ workflows:
- master
requires:
- prep-deps
- test-deps-audit:
requires:
- prep-deps
- test-deps-depcheck:
requires:
- prep-deps
- test-yarn-dedupe:
requires:
- prep-deps
- validate-lavamoat-allow-scripts:
requires:
- prep-deps
Expand Down Expand Up @@ -291,7 +282,6 @@ workflows:
- prep-build-flask-mv2
- all-tests-pass:
requires:
- test-deps-depcheck
- validate-lavamoat-allow-scripts
- validate-lavamoat-policy-build
- validate-lavamoat-policy-webapp
Expand Down Expand Up @@ -964,17 +954,6 @@ jobs:
name: Rerun workflows from failed
command: yarn ci-rerun-from-failed

test-yarn-dedupe:
executor: node-browsers-small
steps:
- run: *shallow-git-clone-and-enable-vnc
- run: sudo corepack enable
- attach_workspace:
at: .
- run:
name: Detect yarn lock deduplications
command: yarn dedupe --check

test-lint:
executor: node-browsers-medium
steps:
Expand Down Expand Up @@ -1053,28 +1032,6 @@ jobs:
name: Validate release candidate changelog
command: .circleci/scripts/validate-changelog-in-rc.sh

test-deps-audit:
executor: node-browsers-small
steps:
- run: *shallow-git-clone-and-enable-vnc
- run: sudo corepack enable
- attach_workspace:
at: .
- run:
name: yarn audit
command: yarn audit

test-deps-depcheck:
executor: node-browsers-small
steps:
- run: *shallow-git-clone-and-enable-vnc
- run: sudo corepack enable
- attach_workspace:
at: .
- run:
name: depcheck
command: yarn depcheck

test-e2e-chrome-webpack:
executor: node-browsers-medium-plus
parallelism: 20
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@ jobs:
run: ${{ steps.download-actionlint.outputs.executable }} -color
shell: bash

test-deps-audit:
name: Test deps audit
uses: ./.github/workflows/test-deps-audit.yml

test-yarn-dedupe:
name: Test yarn dedupe
uses: ./.github/workflows/test-yarn-dedupe.yml

test-deps-depcheck:
name: Test deps depcheck
uses: ./.github/workflows/test-deps-depcheck.yml

run-tests:
name: Run tests
uses: ./.github/workflows/run-tests.yml
Expand All @@ -41,6 +53,8 @@ jobs:
runs-on: ubuntu-latest
needs:
- check-workflows
- test-yarn-dedupe
- test-deps-depcheck
- run-tests
- wait-for-circleci-workflow-status
outputs:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/test-deps-audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Test deps audit

on:
workflow_call:

jobs:
test-deps-audit:
name: Test deps audit
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup environment
uses: metamask/github-tools/.github/actions/setup-environment@main

- name: Run audit
run: yarn audit
18 changes: 18 additions & 0 deletions .github/workflows/test-deps-depcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Test deps depcheck

on:
workflow_call:

jobs:
test-deps-depcheck:
name: Test deps depcheck
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup environment
uses: metamask/github-tools/.github/actions/setup-environment@main

- name: Run depcheck
run: yarn depcheck
18 changes: 18 additions & 0 deletions .github/workflows/test-yarn-dedupe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Test yarn dedupe

on:
workflow_call:

jobs:
test-yarn-dedupe:
name: Test yarn dedupe
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup environment
uses: metamask/github-tools/.github/actions/setup-environment@main

- name: Detect yarn lock deduplications
run: yarn dedupe --check

0 comments on commit 0ab7368

Please sign in to comment.