From e911208e6ff8380f23d9a2a36ac51613db383786 Mon Sep 17 00:00:00 2001
From: kevaundray <kevtheappdev@gmail.com>
Date: Tue, 22 Apr 2025 19:38:17 +0100
Subject: [PATCH] chore: pin crunchy by including it in one of the member
 crates (#15854)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
---
 .github/workflows/dependencies.yml | 38 +-----------------------------
 Cargo.lock                         |  1 +
 testing/ef-tests/Cargo.toml        |  5 ++++
 3 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index ca6abfd314..49c13d38b8 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -17,40 +17,4 @@ jobs:
   update:
     uses: ithacaxyz/ci/.github/workflows/cargo-update-pr.yml@main
     secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
-
-  # re‑pin `crunchy` to version 0.2.2 since 0.2.3 is broken.
-  # The Cargo.toml file states we want `=0.2.2` however cargo update
-  # is not respecting this.
-  # For underlying issue, See: https://github.com/eira-fransham/crunchy/issues/13
-  repin-crunchy:
-    needs: update
-    runs-on: ubuntu-latest
-
-    steps:
-      # The ithaca re-usable workflow will create a PR on
-      # branch `cargo-update`. So we re-check that branch out.
-      - uses: actions/checkout@v4
-        with:
-          ref: cargo-update
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-
-      - name: Re-pin crunchy to 0.2.2
-        run: cargo update -p crunchy --precise 0.2.2
-
-      - name: Commit & push if Cargo.lock changed
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          if ! git diff --quiet -- Cargo.lock; then
-            git config user.name  "github-actions[bot]"
-            git config user.email "github-actions[bot]@users.noreply.github.com"
-            git add Cargo.lock
-            git commit -m "ci: re‑pin crunchy to 0.2.2"
-            git push origin cargo-update
-          fi
\ No newline at end of file
+      token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index e234c9479a..7bcfa495ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3083,6 +3083,7 @@ dependencies = [
  "alloy-eips",
  "alloy-primitives 1.0.0",
  "alloy-rlp",
+ "crunchy",
  "rayon",
  "reth-chainspec",
  "reth-db",
diff --git a/testing/ef-tests/Cargo.toml b/testing/ef-tests/Cargo.toml
index 8ea9bbe27f..297d9a4aa1 100644
--- a/testing/ef-tests/Cargo.toml
+++ b/testing/ef-tests/Cargo.toml
@@ -43,3 +43,8 @@ serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 rayon.workspace = true
+# TODO: When we build for a windows target on an ubuntu runner, crunchy tries to
+# get the wrong path, update this when the workflow has been updated
+#
+# See: https://github.com/eira-fransham/crunchy/issues/13
+crunchy = "=0.2.2"