Skip to content

Commit

Permalink
Merge pull request bnb-chain#28 from bnb-chain/roshan/merge-beta8
Browse files Browse the repository at this point in the history
chore: merge upstream into develop
  • Loading branch information
unclezoro authored Jun 5, 2024
2 parents 7fca98b + c466874 commit 2a806ad
Show file tree
Hide file tree
Showing 913 changed files with 18,674 additions and 79,386 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ indent_size = 4
[*.rs]
max_line_length = 100

[*.{yml,yaml}]
indent_size = 2

[*.md]
# double whitespace at end of line
# denotes a line break in Markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ contact_links:
about: Please ask and answer questions here to keep the issue tracker clean.
- name: Security
url: mailto:georgios@paradigm.xyz
about: Please report security vulnerabilities here.
about: Please report security vulnerabilities here.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
label: Describe the feature
description: |
Please describe the feature and what it is aiming to solve, if relevant.
If the feature is for a crate, please include a proposed API surface.
validations:
required: true
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/assertoor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id: services
run: |
export github_sha=${{ github.sha }}
export github_repository=${{ github.repository }}
export github_repository=${{ github.repository }}
cat etc/assertoor/assertoor-template.yaml | envsubst > etc/assertoor/assertoor.yaml
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
elif [ "$task_result" == "failure" ]; then
task_result="${RED}failure${NC}"
fi
echo -e " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title"
done <<< $(echo "$tasks")
}
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
echo "$task_lines"
fi
if [ $failed_tests -gt 0 ]; then
if [ $failed_tests -gt 0 ]; then
final_test_result="failure"
break
fi
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
with:
name: "kurtosis-enclave-dump-${{ github.run_id }}"
path: ./temp/dump

- name: Return test result
shell: bash
run: |
Expand Down Expand Up @@ -227,4 +227,3 @@ jobs:
exit 1 # fail action
fi
1 change: 0 additions & 1 deletion .github/workflows/label-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ jobs:
script: |
const label_pr = require('./.github/scripts/label_pr.js')
await label_pr({github, context})
21 changes: 20 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,25 @@ jobs:
components: rustfmt
- run: cargo fmt --all --check

book:
name: book
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: "1.76" # MSRV
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- run: cargo build --bin reth --workspace --features ethereum
env:
RUSTFLAGS: -D warnings
- run: ./book/cli/update.sh target/debug/reth
- name: Check book changes
run: git diff --exit-code

codespell:
runs-on: ubuntu-latest
timeout-minutes: 30
Expand All @@ -131,7 +150,7 @@ jobs:
name: lint success
runs-on: ubuntu-latest
if: always()
needs: [clippy-binaries, clippy, crate-checks, docs, fmt, codespell, grafana]
needs: [clippy-binaries, clippy, crate-checks, docs, fmt, book, codespell, grafana]
timeout-minutes: 30
steps:
- name: Decide whether the needed jobs succeeded or failed
Expand Down
Loading

0 comments on commit 2a806ad

Please sign in to comment.