Skip to content

Commit 2b1419e

Browse files
authored
Merge branch 'master' into rusowsky/fmt-solar
2 parents 8531cff + 322b227 commit 2b1419e

File tree

36 files changed

+494
-279
lines changed

36 files changed

+494
-279
lines changed

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
toolchain: stable
4949

5050
- name: Cache Rust dependencies
51-
uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
51+
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
5252
with:
5353
workspaces: |
5454
./

.github/workflows/nextest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
with:
6666
toolchain: stable
6767
target: ${{ matrix.target }}
68-
- uses: taiki-e/install-action@8ea32481661d5e04d602f215b94f17e4014b44f9 # v2
68+
- uses: taiki-e/install-action@cd39cb0572834c149bf3533a143f05e09def0f3c # v2
6969
with:
7070
tool: nextest
7171

@@ -95,7 +95,7 @@ jobs:
9595
~/.foundry/cache
9696
~/.config/.foundry/cache
9797
key: rpc-cache-${{ hashFiles('crates/forge/tests/rpc-cache-keyfile') }}
98-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
98+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
9999
with:
100100
cache-on-failure: true
101101
- name: Setup Git config

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
3838
with:
3939
toolchain: nightly
40-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
40+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
4141
with:
4242
cache-on-failure: true
4343
- name: Build documentation
@@ -79,7 +79,7 @@ jobs:
7979
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
8080
with:
8181
toolchain: stable
82-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
82+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
8383
with:
8484
cache-on-failure: true
8585
- run: cargo test --workspace --doc
@@ -108,7 +108,7 @@ jobs:
108108
with:
109109
toolchain: nightly
110110
components: clippy
111-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
111+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
112112
with:
113113
cache-on-failure: true
114114
- run: cargo clippy --workspace --all-targets --all-features
@@ -142,7 +142,7 @@ jobs:
142142
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
143143
with:
144144
toolchain: stable
145-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
145+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
146146
with:
147147
cache-on-failure: true
148148
- name: forge fmt
@@ -161,10 +161,10 @@ jobs:
161161
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
162162
with:
163163
toolchain: stable
164-
- uses: taiki-e/install-action@8ea32481661d5e04d602f215b94f17e4014b44f9 # v2
164+
- uses: taiki-e/install-action@cd39cb0572834c149bf3533a143f05e09def0f3c # v2
165165
with:
166166
tool: cargo-hack
167-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2
167+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2
168168
with:
169169
cache-on-failure: true
170170
- run: cargo hack check

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ foundry-linking = { path = "crates/linking" }
209209

210210
# solc & compilation utilities
211211
foundry-block-explorers = { version = "0.22.0", default-features = false }
212-
foundry-compilers = { version = "0.19.1", default-features = false }
212+
foundry-compilers = { version = "0.19.1", default-features = false, features = [
213+
"rustls",
214+
"svm-solc",
215+
] }
213216
foundry-fork-db = "0.18"
214217
solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
215218
solar = { package = "solar-compiler", version = "=0.1.7", default-features = false }

0 commit comments

Comments
 (0)