Skip to content

Commit 42484e5

Browse files
authored
Merge branch 'master' into jstracer-impl
2 parents 401d487 + e5519c6 commit 42484e5

File tree

47 files changed

+601
-468
lines changed

Some content is hidden

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

47 files changed

+601
-468
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ testdata/cheats/Vm.sol linguist-generated
44
# See <https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header>
55
*.rs diff=rust
66
crates/lint/testdata/* text eol=lf
7+
testdata/fixtures/**/* eol=lf
78

89
dprint.json linguist-language=JSON-with-Comments
9-
.devcontainer/devcontainer.json linguist-language=JSON-with-Comments
10+
.devcontainer/devcontainer.json linguist-language=JSON-with-Comments

.github/scripts/combine-benchmarks.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ EOF
126126
FIRST_FILE=1
127127
SYSTEM_INFO=""
128128

129-
for bench_file in "forge_test_bench.md" "forge_build_bench.md" "forge_coverage_bench.md"; do
129+
for bench_file in "forge_test_bench.md" "forge_isolate_test_bench.md" "forge_build_bench.md" "forge_coverage_bench.md"; do
130130
if [ -f "$OUTPUT_DIR/$bench_file" ]; then
131131
echo "Processing $bench_file..."
132132

@@ -135,6 +135,9 @@ for bench_file in "forge_test_bench.md" "forge_build_bench.md" "forge_coverage_b
135135
"forge_test_bench.md")
136136
SECTION_NAME="Forge Test"
137137
;;
138+
"forge_isolate_test_bench.md")
139+
SECTION_NAME="Forge Test (Isolated)"
140+
;;
138141
"forge_build_bench.md")
139142
SECTION_NAME="Forge Build"
140143
;;

.github/workflows/benchmarks.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,20 @@ jobs:
8383
--benchmarks forge_test,forge_fuzz_test \
8484
--output-file forge_test_bench.md
8585
86+
- name: Run forge isolate test benchmarks
87+
env:
88+
FOUNDRY_DIR: ${{ github.workspace }}/.foundry
89+
run: |
90+
VERSIONS="${{ github.event.inputs.versions || 'stable,nightly' }}"
91+
# Isolate tests default to Vectorized/solady but can be overridden
92+
REPOS="${{ github.event.inputs.repos || env.VECTORIZED_SOLADY }}"
93+
94+
./target/release/foundry-bench --output-dir ./benches --force-install \
95+
--versions $VERSIONS \
96+
--repos $REPOS \
97+
--benchmarks forge_isolate_test \
98+
--output-file forge_isolate_test_bench.md
99+
86100
- name: Run forge build benchmarks
87101
env:
88102
FOUNDRY_DIR: ${{ github.workspace }}/.foundry
@@ -124,6 +138,7 @@ jobs:
124138
name: benchmark-results
125139
path: |
126140
benches/forge_test_bench.md
141+
benches/forge_isolate_test_bench.md
127142
benches/forge_build_bench.md
128143
benches/forge_coverage_bench.md
129144
benches/LATEST.md

0 commit comments

Comments
 (0)