Skip to content

Commit 34f411a

Browse files
authored
Merge pull request #451 from morpho-org/remove-yarn
remove yarn
2 parents adc6c3b + 5c2bcdc commit 34f411a

40 files changed

Lines changed: 57 additions & 6016 deletions

.env.example

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

.github/actions/install-cache/action.yml

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

.github/actions/install/action.yml

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

.github/workflows/formatting.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
with:
1919
submodules: recursive
2020

21-
- uses: ./.github/actions/install
21+
- name: Install Foundry
22+
uses: foundry-rs/foundry-toolchain@8789b3e21e6c11b2697f5eb56eddae542f746c10 # v1
2223

2324
- name: Run Linter
24-
run: yarn lint
25+
run: forge fmt --check

.github/workflows/foundry.yml

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
jobs:
14-
build-via-ir:
15-
name: Compilation (via IR)
14+
build:
15+
name: Compilation
1616
runs-on: ubuntu-latest
1717

1818
steps:
@@ -21,38 +21,14 @@ jobs:
2121
with:
2222
submodules: recursive
2323

24-
- uses: ./.github/actions/install
24+
- name: Install Foundry
25+
uses: foundry-rs/foundry-toolchain@8789b3e21e6c11b2697f5eb56eddae542f746c10 # v1
2526

26-
- name: Build contracts via IR & check sizes
27-
run: yarn build:forge --force --sizes # don't use compilation cache
28-
29-
build-no-ir:
30-
name: Compilation (without IR)
31-
runs-on: ubuntu-latest
32-
33-
steps:
34-
- name: Checkout
35-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
36-
with:
37-
submodules: recursive
38-
39-
- uses: ./.github/actions/install-cache
40-
41-
- name: Build contracts without IR
42-
run: yarn build:forge
43-
env:
44-
FOUNDRY_PROFILE: no_via_ir
45-
46-
- name: Save forge compilation cache
47-
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
48-
with:
49-
path: |
50-
cache
51-
out
52-
key: forge-${{ github.ref_name }}-${{ github.run_id }}
27+
- name: Build contracts & check sizes
28+
run: forge build --force --sizes # don't use compilation cache
5329

5430
test:
55-
needs: build-no-ir
31+
needs: build
5632

5733
name: Tests
5834
runs-on: ubuntu-latest
@@ -79,10 +55,14 @@ jobs:
7955
with:
8056
submodules: recursive
8157

82-
- uses: ./.github/actions/install-cache
58+
- name: Install Foundry
59+
uses: foundry-rs/foundry-toolchain@8789b3e21e6c11b2697f5eb56eddae542f746c10 # v1
60+
61+
- name: Build morpho-blue
62+
run: cd lib/morpho-blue && forge build
8363

8464
- name: Run tests in ${{ matrix.type }} mode
85-
run: yarn test:forge -vvv
65+
run: forge test -vvv
8666
env:
8767
FOUNDRY_FUZZ_RUNS: ${{ matrix.fuzz-runs }}
8868
FOUNDRY_FUZZ_MAX_TEST_REJECTS: ${{ matrix.max-test-rejects }}

.github/workflows/hardhat.yml

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

.github/workflows/npm-release.yml

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

.gitignore

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,15 @@ dist/
1111
# Docs
1212
docs/
1313

14-
# Dotenv file
15-
.env
16-
1714
# IDE
1815
.vscode
1916

2017
# data
2118
data/
2219
broadcast/
2320

24-
# Node.js
25-
node_modules/
26-
2721
# Certora
2822
.certora_internal
2923
munged/
3024

31-
# Hardhat
32-
/types
33-
/cache_hardhat
34-
/artifacts
35-
3625
*.log

.husky/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.husky/post-checkout

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

0 commit comments

Comments
 (0)