Merge branch 'master' into v1.3.0-benches

Author: yash-atreya

.codespellrc

@@ -4,6 +4,7 @@ testdata/cheats/Vm.sol linguist-generated
 # See <https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header>
 *.rs diff=rust
 crates/lint/testdata/* text eol=lf
+testdata/fixtures/**/* eol=lf
 
 dprint.json linguist-language=JSON-with-Comments
-.devcontainer/devcontainer.json linguist-language=JSON-with-Comments
+.devcontainer/devcontainer.json linguist-language=JSON-with-Comments

.gitattributes

@@ -126,7 +126,7 @@ EOF
 FIRST_FILE=1
 SYSTEM_INFO=""
 
-for bench_file in "forge_test_bench.md" "forge_build_bench.md" "forge_coverage_bench.md"; do
+for bench_file in "forge_test_bench.md" "forge_isolate_test_bench.md" "forge_build_bench.md" "forge_coverage_bench.md"; do
     if [ -f "$OUTPUT_DIR/$bench_file" ]; then
         echo "Processing $bench_file..."
 
@@ -135,6 +135,9 @@ for bench_file in "forge_test_bench.md" "forge_build_bench.md" "forge_coverage_b
             "forge_test_bench.md")
                 SECTION_NAME="Forge Test"
                 ;;
+            "forge_isolate_test_bench.md")
+                SECTION_NAME="Forge Test (Isolated)"
+                ;;
             "forge_build_bench.md")
                 SECTION_NAME="Forge Build"
                 ;;

.github/actions/benchmark-setup/action.yml

@@ -28,8 +28,8 @@ env:
   DEFAULT_REPOS: "ithacaxyz/account:v0.3.2,Vectorized/solady:v0.1.22"
 
 jobs:
-  setup:
-    name: Setup and Build
+  run-benchmarks:
+    name: Run All Benchmarks
     runs-on: foundry-runner
     steps:
       - name: Checkout repository
@@ -59,22 +59,16 @@ jobs:
       - name: Build benchmark binary
         run: cargo build --release --bin foundry-bench
 
-      - name: Upload benchmark binary
-        uses: actions/upload-artifact@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          name: foundry-bench
-          path: target/release/foundry-bench
-
-  forge-test-bench:
-    name: Forge Test Benchmarks
-    needs: setup
-    runs-on: foundry-runner
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+          node-version: "24"
 
-      - name: Benchmark setup
-        uses: ./.github/actions/benchmark-setup
+      - name: Install hyperfine
+        run: |
+          curl -L https://github.com/sharkdp/hyperfine/releases/download/v1.19.0/hyperfine-v1.19.0-x86_64-unknown-linux-gnu.tar.gz | tar xz
+          sudo mv hyperfine-v1.19.0-x86_64-unknown-linux-gnu/hyperfine /usr/local/bin/
+          rm -rf hyperfine-v1.19.0-x86_64-unknown-linux-gnu
 
       - name: Run forge test benchmarks
         env:
@@ -83,28 +77,25 @@ jobs:
           VERSIONS="${{ github.event.inputs.versions || 'stable,nightly' }}"
           REPOS="${{ github.event.inputs.repos || env.DEFAULT_REPOS }}"
 
-          ./foundry-bench --output-dir ./benches --force-install \
+          ./target/release/foundry-bench --output-dir ./benches --force-install \
             --versions $VERSIONS \
             --repos $REPOS \
             --benchmarks forge_test,forge_fuzz_test \
             --output-file forge_test_bench.md
 
-      - name: Upload test benchmark results
-        uses: actions/upload-artifact@v4
-        with:
-          name: forge-test-results
-          path: benches/forge_test_bench.md
-
-  forge-build-bench:
-    name: Forge Build Benchmarks
-    needs: setup
-    runs-on: foundry-runner
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: Run forge isolate test benchmarks
+        env:
+          FOUNDRY_DIR: ${{ github.workspace }}/.foundry
+        run: |
+          VERSIONS="${{ github.event.inputs.versions || 'stable,nightly' }}"
+          # Isolate tests default to Vectorized/solady but can be overridden
+          REPOS="${{ github.event.inputs.repos || env.VECTORIZED_SOLADY }}"
 
-      - name: Benchmark setup
-        uses: ./.github/actions/benchmark-setup
+          ./target/release/foundry-bench --output-dir ./benches --force-install \
+            --versions $VERSIONS \
+            --repos $REPOS \
+            --benchmarks forge_isolate_test \
+            --output-file forge_isolate_test_bench.md
 
       - name: Run forge build benchmarks
         env:
@@ -113,85 +104,76 @@ jobs:
           VERSIONS="${{ github.event.inputs.versions || 'stable,nightly' }}"
           REPOS="${{ github.event.inputs.repos || env.DEFAULT_REPOS }}"
 
-          ./foundry-bench --output-dir ./benches --force-install \
+          ./target/release/foundry-bench --output-dir ./benches --force-install \
             --versions $VERSIONS \
             --repos $REPOS \
             --benchmarks forge_build_no_cache,forge_build_with_cache \
             --output-file forge_build_bench.md
 
-      - name: Upload build benchmark results
-        uses: actions/upload-artifact@v4
-        with:
-          name: forge-build-results
-          path: benches/forge_build_bench.md
-
-  forge-coverage-bench:
-    name: Forge Coverage Benchmarks
-    needs: setup
-    runs-on: foundry-runner
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Benchmark setup
-        uses: ./.github/actions/benchmark-setup
-
       - name: Run forge coverage benchmarks
         env:
           FOUNDRY_DIR: ${{ github.workspace }}/.foundry
         run: |
           VERSIONS="${{ github.event.inputs.versions || 'stable,nightly' }}"
           # Coverage only runs on ithacaxyz/account:v0.3.2
 
-          ./foundry-bench --output-dir ./benches --force-install \
+          ./target/release/foundry-bench --output-dir ./benches --force-install \
             --versions $VERSIONS \
             --repos ${{ env.ITHACAXYZ_ACCOUNT }} \
             --benchmarks forge_coverage \
             --output-file forge_coverage_bench.md
 
-      - name: Upload coverage benchmark results
+      - name: Combine benchmark results
+        run: ./.github/scripts/combine-benchmarks.sh benches
+
+      - name: Commit and read benchmark results
+        id: benchmark_results
+        env:
+          GITHUB_HEAD_REF: ${{ github.head_ref }}
+        run: ./.github/scripts/commit-and-read-benchmarks.sh benches "${{ github.event_name }}" "${{ github.repository }}"
+
+      - name: Upload benchmark results as artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: forge-coverage-results
-          path: benches/forge_coverage_bench.md
-
-  combine-results:
-    name: Combine and Publish Results
-    needs: [forge-test-bench, forge-build-bench, forge-coverage-bench]
+          name: benchmark-results
+          path: |
+            benches/forge_test_bench.md
+            benches/forge_isolate_test_bench.md
+            benches/forge_build_bench.md
+            benches/forge_coverage_bench.md
+            benches/LATEST.md
+
+    outputs:
+      branch_name: ${{ steps.benchmark_results.outputs.branch_name }}
+      pr_comment: ${{ steps.benchmark_results.outputs.pr_comment }}
+
+  publish-results:
+    name: Publish Results
+    needs: run-benchmarks
     runs-on: foundry-runner
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Download all benchmark results
+      - name: Download benchmark results
         uses: actions/download-artifact@v4
         with:
-          pattern: forge-*-results
+          name: benchmark-results
           path: benches/
-          merge-multiple: true
-
-      - name: Combine benchmark results
-        run: ./.github/scripts/combine-benchmarks.sh benches
-
-      - name: Commit and read benchmark results
-        id: benchmark_results
-        env:
-          GITHUB_HEAD_REF: ${{ github.head_ref }}
-        run: ./.github/scripts/commit-and-read-benchmarks.sh benches "${{ github.event_name }}" "${{ github.repository }}"
 
       - name: Push branch for manual runs
         if: github.event_name == 'workflow_dispatch'
         run: |
-          git push origin "${{ steps.benchmark_results.outputs.branch_name }}"
-          echo "Pushed branch: ${{ steps.benchmark_results.outputs.branch_name }}"
+          git push origin "${{ needs.run-benchmarks.outputs.branch_name }}"
+          echo "Pushed branch: ${{ needs.run-benchmarks.outputs.branch_name }}"
 
       - name: Create PR for manual runs
         if: github.event_name == 'workflow_dispatch'
         uses: actions/github-script@v7
         with:
           script: |
-            const branchName = '${{ steps.benchmark_results.outputs.branch_name }}';
-            const prComment = `${{ steps.benchmark_results.outputs.pr_comment }}`;
+            const branchName = '${{ needs.run-benchmarks.outputs.branch_name }}';
+            const prComment = `${{ needs.run-benchmarks.outputs.pr_comment }}`;
 
             // Create the pull request
             const { data: pr } = await github.rest.pulls.create({
@@ -219,7 +201,7 @@ jobs:
         with:
           script: |
             const prNumber = ${{ github.event.inputs.pr_number || github.event.pull_request.number }};
-            const prComment = `${{ steps.benchmark_results.outputs.pr_comment }}`;
+            const prComment = `${{ needs.run-benchmarks.outputs.pr_comment }}`;
 
             const comment = `${prComment}
 

.github/scripts/combine-benchmarks.sh

@@ -53,14 +53,12 @@ jobs:
           cache-on-failure: true
       - run: cargo test --workspace --doc
 
-  codespell:
+  typos:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - uses: codespell-project/actions-codespell@v2
-        with:
-          skip: "*.json"
+      - uses: crate-ci/typos@v1
 
   clippy:
     runs-on: ubuntu-latest
@@ -120,7 +118,7 @@ jobs:
       - nextest
       - docs
       - doctest
-      - codespell
+      - typos
       - clippy
       - rustfmt
       - forge-fmt