Skip to content

Commit d81d8fe

Browse files
authored
Merge branch 'master' into fix/linking-deep-merge-link-references
2 parents 67d1520 + ad1f9ab commit d81d8fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+3117
-889
lines changed

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ jobs:
4747
with:
4848
toolchain: stable
4949

50+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
51+
5052
- name: Cache Rust dependencies
51-
uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
53+
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
5254
with:
5355
workspaces: |
5456
./

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
3333
with:
3434
toolchain: stable
35+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
3536
- name: Install gcc aarch64
3637
id: aarch_64_setup
3738
run: |

.github/workflows/nextest.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ jobs:
6565
with:
6666
toolchain: stable
6767
target: ${{ matrix.target }}
68-
- uses: taiki-e/install-action@8ea32481661d5e04d602f215b94f17e4014b44f9 # v2
68+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
69+
- uses: taiki-e/install-action@cd39cb0572834c149bf3533a143f05e09def0f3c # v2
6970
with:
7071
tool: nextest
7172

@@ -95,7 +96,7 @@ jobs:
9596
~/.foundry/cache
9697
~/.config/.foundry/cache
9798
key: rpc-cache-${{ hashFiles('crates/forge/tests/rpc-cache-keyfile') }}
98-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
99+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
99100
with:
100101
cache-on-failure: true
101102
- name: Setup Git config

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ jobs:
145145
with:
146146
toolchain: stable
147147
targets: ${{ matrix.target }}
148+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
148149

149150
- name: Apple M1 setup
150151
if: matrix.target == 'aarch64-apple-darwin'

.github/workflows/test.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
3838
with:
3939
toolchain: nightly
40-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
40+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
41+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
4142
with:
4243
cache-on-failure: true
4344
- name: Build documentation
@@ -79,7 +80,8 @@ jobs:
7980
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
8081
with:
8182
toolchain: stable
82-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
83+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
84+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
8385
with:
8486
cache-on-failure: true
8587
- run: cargo test --workspace --doc
@@ -108,7 +110,8 @@ jobs:
108110
with:
109111
toolchain: nightly
110112
components: clippy
111-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
113+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
114+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
112115
with:
113116
cache-on-failure: true
114117
- run: cargo clippy --workspace --all-targets --all-features
@@ -142,7 +145,8 @@ jobs:
142145
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
143146
with:
144147
toolchain: stable
145-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
148+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
149+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
146150
with:
147151
cache-on-failure: true
148152
- name: forge fmt
@@ -161,10 +165,11 @@ jobs:
161165
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
162166
with:
163167
toolchain: stable
164-
- uses: taiki-e/install-action@8ea32481661d5e04d602f215b94f17e4014b44f9 # v2
168+
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
169+
- uses: taiki-e/install-action@cd39cb0572834c149bf3533a143f05e09def0f3c # v2
165170
with:
166171
tool: cargo-hack
167-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
172+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
168173
with:
169174
cache-on-failure: true
170175
- run: cargo hack check

Cargo.lock

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,16 @@ foundry-linking = { path = "crates/linking" }
208208

209209
# solc & compilation utilities
210210
foundry-block-explorers = { version = "0.22.0", default-features = false }
211-
foundry-compilers = { version = "0.19.1", default-features = false }
211+
foundry-compilers = { version = "0.19.1", default-features = false, features = [
212+
"rustls",
213+
"svm-solc",
214+
] }
212215
foundry-fork-db = "0.18"
213216
solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
214217
solar = { package = "solar-compiler", version = "=0.1.7", default-features = false }
218+
svm = { package = "svm-rs", version = "0.5", default-features = false, features = [
219+
"rustls",
220+
] }
215221

216222
## alloy
217223
alloy-consensus = { version = "1.0.23", default-features = false }
@@ -317,6 +323,7 @@ itertools = "0.14"
317323
jsonpath_lib = "0.3"
318324
k256 = "0.13"
319325
mesc = "0.3"
326+
memchr = "2.7"
320327
num-format = "0.4"
321328
parking_lot = "0.12"
322329
proptest = "1.7.0"

0 commit comments

Comments
 (0)