Skip to content

Commit

Permalink
Merge branch 'master' into 7368/reorg
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwardJES authored Aug 28, 2024
2 parents a001cc5 + 0d83028 commit d9c0ffc
Show file tree
Hide file tree
Showing 303 changed files with 13,188 additions and 5,440 deletions.
11 changes: 1 addition & 10 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
* @danipopes @evalir @mattsse

crates/anvil/ @danipopes @mattsse @evalir
crates/cheatcodes/ @danipopes @mattsse @klkvr @evalir
crates/evm/coverage/ @onbjerg
crates/fmt/ @rkrasiuk
crates/linking/ @klkvr
crates/macros/ @danipopes
crates/script/ @danipopes @mattsse @klkvr
crates/wallets/ @klkvr
* @danipopes @klkvr @mattsse
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG-FORM.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Bug report
description: File a bug report
labels: ["T-bug"]
labels: ["T-bug", "T-needs-triage"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/FEATURE-FORM.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature request
description: Suggest a feature
labels: ["T-feature"]
labels: ["T-feature", "T-needs-triage"]
body:
- type: markdown
attributes:
Expand Down
7 changes: 7 additions & 0 deletions .github/scripts/format.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -eo pipefail

# We have to ignore at shell level because testdata/ is not a valid Foundry project,
# so running `forge fmt` with `--root testdata` won't actually check anything
shopt -s extglob
cargo run --bin forge -- fmt "$@" $(find testdata -name '*.sol' ! -name Vm.sol)
10 changes: 4 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,16 @@ jobs:
run: |
set -eo pipefail
target="${{ matrix.target }}"
flags=()
flags=(--release --bins --no-default-features --features rustls,aws-kms,cli,asm-keccak)
# `jemalloc` and `keccak-asm` are not supported on MSVC or aarch64 Linux.
# `jemalloc` is not fully supported on MSVC or aarch64 Linux.
if [[ "$target" != *msvc* && "$target" != "aarch64-unknown-linux-gnu" ]]; then
flags+=(--features asm-keccak,jemalloc,cast/aws-kms,forge/aws-kms)
else
flags+=(--features cast/aws-kms,forge/aws-kms)
flags+=(--features jemalloc)
fi
[[ "$target" == *windows* ]] && exe=".exe"
cargo build --release --bins --target "$target" "${flags[@]}"
cargo build --target "$target" "${flags[@]}"
bins=(anvil cast chisel forge)
for name in "${bins[@]}"; do
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,7 @@ jobs:
cache-on-failure: true
- name: forge fmt
shell: bash
# We have to ignore at shell level because testdata/ is not a valid Foundry project,
# so running `forge fmt` with `--root testdata` won't actually check anything
run: |
shopt -s extglob
cargo run --bin forge -- fmt --check $(find testdata -name '*.sol' ! -name Vm.sol)
run: ./.github/scripts/format.sh --check

crate-checks:
runs-on: ubuntu-latest
Expand Down
Loading

0 comments on commit d9c0ffc

Please sign in to comment.