Skip to content

Commit 48b2a62

Browse files
authored
Merge pull request #745 from morpho-org/chore/ci-update
chore: ci updates
2 parents 0223b11 + 1370925 commit 48b2a62

File tree

5 files changed

+22
-65
lines changed

5 files changed

+22
-65
lines changed

.github/workflows/certora.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
strategy:
15-
fail-fast: false
16-
1715
matrix:
1816
conf:
1917
- AccrueInterest
@@ -31,25 +29,20 @@ jobs:
3129
- Transfer
3230

3331
steps:
34-
- uses: actions/checkout@v4
35-
with:
36-
submodules: recursive
32+
- uses: actions/checkout@v5
3733

38-
- name: Install python
39-
uses: actions/setup-python@v5
34+
- uses: actions/setup-python@v5
4035
with:
4136
python-version: ">=3.9"
4237

43-
- name: Install certora
44-
run: pip install certora-cli
38+
- run: pip install certora-cli
4539

4640
- name: Install solc
4741
run: |
4842
wget https://github.com/ethereum/solidity/releases/download/v0.8.19/solc-static-linux
4943
chmod +x solc-static-linux
5044
sudo mv solc-static-linux /usr/local/bin/solc-0.8.19
5145
52-
- name: Verify ${{ matrix.conf }}
53-
run: certoraRun certora/confs/${{ matrix.conf }}.conf
46+
- run: certoraRun certora/confs/${{ matrix.conf }}.conf
5447
env:
5548
CERTORAKEY: ${{ secrets.CERTORAKEY }}

.github/workflows/formatting.yml

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

.github/workflows/foundry.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,19 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
forge-test:
16-
strategy:
17-
fail-fast: true
18-
15+
fmt:
1916
runs-on: ubuntu-latest
2017
steps:
21-
- uses: actions/checkout@v3
22-
with:
23-
submodules: recursive
24-
25-
- name: Install Foundry
26-
uses: foundry-rs/foundry-toolchain@v1
18+
- uses: actions/checkout@v5
19+
- uses: foundry-rs/foundry-toolchain@v1
20+
- run: forge fmt --check
2721

28-
- name: Run Forge tests
29-
run: FOUNDRY_PROFILE=test forge test -vvv
22+
test:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v5
26+
- uses: foundry-rs/foundry-toolchain@v1
27+
- run: forge test -vvv
3028
env:
3129
FOUNDRY_FUZZ_RUNS: 10000
3230
FOUNDRY_FUZZ_MAX_TEST_REJECTS: 500000

.github/workflows/halmos.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
submodules: recursive
18-
19-
- name: Install python
20-
uses: actions/setup-python@v5
15+
- uses: actions/checkout@v5
16+
- uses: actions/setup-python@v5
2117
with:
2218
python-version: ">=3.9"
23-
24-
- name: Install Foundry
25-
uses: foundry-rs/foundry-toolchain@v1
26-
27-
- name: Install halmos
28-
run: pip install halmos
29-
30-
- name: Run Halmos
31-
run: FOUNDRY_PROFILE=test halmos
19+
- uses: foundry-rs/foundry-toolchain@v1
20+
- run: pip install halmos
21+
- run: halmos

foundry.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ wrap_comments = true
1919
[lint]
2020
exclude_lints = [
2121
"unaliased-plain-import",
22-
"unused-import",
23-
"unsafe-typecast",
24-
"mixed-case-variable",
25-
"mixed-case-function",
2622
"asm-keccak256",
2723
"unwrapped-modifier-logic",
2824
]
25+
ignore = [
26+
'test/**/*.sol'
27+
]
2928

3029
[profile.no_via_ir]
3130
via-ir = false

0 commit comments

Comments
 (0)