Skip to content

Commit

Permalink
Merge pull request #43 from scroll-tech/chore-merge-upstream-02824da4f
Browse files Browse the repository at this point in the history
chore: merge upstream 02824da
  • Loading branch information
Thegaram authored Nov 25, 2024
2 parents 5f1c8e3 + 2d8305b commit 6a92512
Show file tree
Hide file tree
Showing 329 changed files with 7,402 additions and 5,356 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ crates/fs-util/ @onbjerg @emhane
crates/metrics/ @onbjerg
crates/net/ @emhane @mattsse @Rjected
crates/net/downloaders/ @onbjerg @rkrasiuk @emhane
crates/node/ @mattsse @Rjected @onbjerg
crates/node/ @mattsse @Rjected @onbjerg @emhane @klkvr
crates/optimism/ @mattsse @Rjected @fgimenez @emhane
crates/payload/ @mattsse @Rjected
crates/primitives/ @Rjected
crates/primitives-traits/ @Rjected @joshieDo
crates/primitives/ @Rjected @emhane @mattsse @klkvr
crates/primitives-traits/ @Rjected @joshieDo @emhane @mattsse @klkvr
crates/prune/ @shekhirin @joshieDo
crates/revm/ @mattsse @rakita
crates/rpc/ @mattsse @Rjected @emhane
Expand Down
2 changes: 2 additions & 0 deletions .github/assets/check_wasm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ exclude_crates=(
reth-optimism-node
reth-optimism-payload-builder
reth-optimism-rpc
reth-optimism-primitives
reth-rpc
reth-rpc-api
reth-rpc-api-testing-util
Expand All @@ -68,6 +69,7 @@ exclude_crates=(
reth-static-file # tokio
reth-transaction-pool # c-kzg
reth-trie-parallel # tokio
reth-testing-utils
)

# Array to hold the results
Expand Down
2 changes: 0 additions & 2 deletions .github/assets/kurtosis_network_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ participants:
- el_type: geth
cl_type: lighthouse
- el_type: reth
el_extra_params:
- --engine.experimental
el_image: "ghcr.io/paradigmxyz/reth:kurtosis-ci"
cl_type: teku
additional_services:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ name: hive
on:
workflow_dispatch:
schedule:
# every day
- cron: "0 0 * * *"
# run every 12 hours
- cron: "0 */12 * * *"

env:
CARGO_TERM_COLOR: always
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kurtosis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ name: kurtosis
on:
workflow_dispatch:
schedule:
# every day
- cron: "0 1 * * *"
# run every 12 hours
- cron: "0 */12 * * *"

env:
CARGO_TERM_COLOR: always
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- uses: dcarbone/install-jq-action@v2
- uses: dcarbone/install-jq-action@v3
- name: Run Wasm checks
run: .github/assets/check_wasm.sh

Expand Down
Loading

0 comments on commit 6a92512

Please sign in to comment.