From c890c5b7cb94fc440902e544aa38cefb6bebd16a Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Wed, 27 Mar 2024 08:27:24 +0000 Subject: [PATCH 1/4] add temp patches for missing alloy namespace deps --- .github/workflows/integration.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f2c9881f..c26f857d 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -57,6 +57,16 @@ jobs: sed -i 's/\(alloy = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \ Cargo.toml + # Temporary patch until https://github.com/alloy-rs/alloy/pull/392 is resolved + sed -i 's/\(alloy-rpc-client = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \ + examples/providers/Cargo.toml + sed -i 's/\(alloy-provider = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \ + examples/providers/Cargo.toml + sed -i 's/\(alloy-rpc-client = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \ + examples/subscriptions/Cargo.toml + sed -i 's/\(alloy-provider = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \ + examples/subscriptions/Cargo.toml + # Update to the latest commit cargo update From d89224b3947273afbd871430020f8b728243c1b0 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Wed, 27 Mar 2024 08:54:35 +0000 Subject: [PATCH 2/4] add temporary patch for `patch` section --- .github/workflows/integration.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c26f857d..63bc68d9 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -52,6 +52,10 @@ jobs: export latest_alloy_commit=$(git ls-remote https://github.com/alloy-rs/alloy.git \ | grep refs/heads/main \ | cut -f 1) + + export lastest_alloy_core_commit=$(git ls-remote https://github.com/alloy-rs/core.git \ + | grep refs/heads/main \ + | cut -f 1) # Use the commit hash to update the rev in Cargo.toml sed -i 's/\(alloy = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \ @@ -67,6 +71,22 @@ jobs: sed -i 's/\(alloy-provider = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \ examples/subscriptions/Cargo.toml + # Temporary patch until `patch` section in Alloy is removed + sed -i 's/\(alloy-core = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \ + Cargo.toml + sed -i 's/\(alloy-dyn-abi = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \ + Cargo.toml + sed -i 's/\(alloy-json-abi = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \ + Cargo.toml + sed -i 's/\(alloy-primitives = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \ + Cargo.toml + sed -i 's/\(alloy-sol-macro = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \ + Cargo.toml + sed -i 's/\(alloy-sol-types = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \ + Cargo.toml + sed -i 's/\(syn-solidity = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \ + Cargo.toml + # Update to the latest commit cargo update From 269383b10df4e23de6eb0da5aa2d794d7d616fcb Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Wed, 27 Mar 2024 08:58:52 +0000 Subject: [PATCH 3/4] fix typo --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 63bc68d9..a806ebad 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -53,7 +53,7 @@ jobs: | grep refs/heads/main \ | cut -f 1) - export lastest_alloy_core_commit=$(git ls-remote https://github.com/alloy-rs/core.git \ + export latest_alloy_core_commit=$(git ls-remote https://github.com/alloy-rs/core.git \ | grep refs/heads/main \ | cut -f 1) From 2e56b119e419e93e7f8b27f00dfc5feb15fe2861 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Wed, 27 Mar 2024 09:30:07 +0000 Subject: [PATCH 4/4] update job name --- .github/workflows/integration.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a806ebad..c7e02224 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -10,7 +10,7 @@ on: # Needed so we can run it manually jobs: - update: + integration: runs-on: ubuntu-latest timeout-minutes: 15 steps: @@ -48,11 +48,12 @@ jobs: fi done - # Fetch the latest commit hash of the main branch from the Alloy repository + # Fetch the latest commit hash of the `main` branch from the Alloy repository export latest_alloy_commit=$(git ls-remote https://github.com/alloy-rs/alloy.git \ | grep refs/heads/main \ | cut -f 1) + # Fetch the latest commit hash of the `main` branch from the Alloy Core repository export latest_alloy_core_commit=$(git ls-remote https://github.com/alloy-rs/core.git \ | grep refs/heads/main \ | cut -f 1)