Skip to content

Commit fadbdcd

Browse files
authored
chore: aggregate PRs: #10038, #11139, #11274, #11246 (#11279)
This PR aggregates changes from the following PRs: - #10038: Make Soldeer Dependency field public by @TilakMaddy - #11139: upgrade to Node.js 24 by @Daulox92 - #11274: CI: migrate workflows to checkout v5 by @rejected-l - #11246: fix: add missing semicolon in typos error message in Makefile by @dizer-ti
1 parent f549490 commit fadbdcd

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

.github/workflows/benchmarks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: foundry-runner
3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737

3838
- name: Install build dependencies
3939
run: |
@@ -153,7 +153,7 @@ jobs:
153153
runs-on: foundry-runner
154154
steps:
155155
- name: Checkout repository
156-
uses: actions/checkout@v4
156+
uses: actions/checkout@v5
157157

158158
- name: Download benchmark results
159159
uses: actions/download-artifact@v4

.github/workflows/bump-forge-std.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: update forge-std tag
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- name: Fetch and update forge-std tag
1717
run: curl 'https://api.github.com/repos/foundry-rs/forge-std/tags' | jq '.[0].commit.sha' -jr > testdata/forge-std-rev
1818
- name: Create pull request

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
contents: read
2525
timeout-minutes: 120
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
2828
- uses: dtolnay/rust-toolchain@stable
2929
- uses: Swatinem/rust-cache@v2
3030
with:

.github/workflows/nextest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
outputs:
2525
test-matrix: ${{ steps.gen.outputs.test-matrix }}
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
2828
- uses: actions/setup-python@v4
2929
with:
3030
python-version: "3.11"
@@ -50,7 +50,7 @@ jobs:
5050
ETH_RPC_URL: https://reth-ethereum.ithaca.xyz/rpc
5151
CARGO_PROFILE_DEV_DEBUG: 0
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454
- uses: dtolnay/rust-toolchain@stable
5555
with:
5656
target: ${{ matrix.target }}
@@ -61,7 +61,7 @@ jobs:
6161
if: contains(matrix.name, 'external')
6262
uses: actions/setup-node@v4
6363
with:
64-
node-version: 20
64+
node-version: 24
6565
- name: Install Bun
6666
if: contains(matrix.name, 'external') && !contains(matrix.runner_label, 'windows')
6767
uses: oven-sh/setup-bun@v1

.github/workflows/nix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: DeterminateSystems/determinate-nix-action@v3
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- uses: DeterminateSystems/update-flake-lock@main
2222
with:
2323
pr-title: "Update flake.lock"
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ${{ matrix.runs-on }}
3333
steps:
3434
- uses: DeterminateSystems/determinate-nix-action@v3
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636

3737
- name: Update flake.lock
3838
run: nix flake update

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
release_name: ${{ steps.release_info.outputs.release_name }}
2828
changelog: ${{ steps.build_changelog.outputs.changelog }}
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
with:
3232
fetch-depth: 0
3333

@@ -128,7 +128,7 @@ jobs:
128128
platform: win32
129129
arch: amd64
130130
steps:
131-
- uses: actions/checkout@v4
131+
- uses: actions/checkout@v5
132132
- uses: dtolnay/rust-toolchain@stable
133133
with:
134134
targets: ${{ matrix.target }}
@@ -279,7 +279,7 @@ jobs:
279279
needs: release
280280
if: always()
281281
steps:
282-
- uses: actions/checkout@v4
282+
- uses: actions/checkout@v5
283283

284284
# Moves the `nightly` tag to `HEAD`
285285
- name: Move nightly tag
@@ -304,7 +304,7 @@ jobs:
304304
needs: [prepare, release-docker, release, cleanup]
305305
if: failure()
306306
steps:
307-
- uses: actions/checkout@v4
307+
- uses: actions/checkout@v5
308308
- uses: JasonEtco/create-an-issue@v2
309309
env:
310310
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
timeout-minutes: 30
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
- uses: dtolnay/rust-toolchain@nightly
3030
- uses: Swatinem/rust-cache@v2
3131
with:
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
timeout-minutes: 30
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
- uses: dtolnay/rust-toolchain@stable
5151
- uses: Swatinem/rust-cache@v2
5252
with:
@@ -57,14 +57,14 @@ jobs:
5757
runs-on: ubuntu-latest
5858
timeout-minutes: 30
5959
steps:
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
6161
- uses: crate-ci/typos@v1
6262

6363
clippy:
6464
runs-on: ubuntu-latest
6565
timeout-minutes: 30
6666
steps:
67-
- uses: actions/checkout@v4
67+
- uses: actions/checkout@v5
6868
- uses: dtolnay/rust-toolchain@clippy
6969
- uses: Swatinem/rust-cache@v2
7070
with:
@@ -77,7 +77,7 @@ jobs:
7777
runs-on: ubuntu-latest
7878
timeout-minutes: 30
7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v5
8181
- uses: dtolnay/rust-toolchain@nightly
8282
with:
8383
components: rustfmt
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-latest
8888
timeout-minutes: 30
8989
steps:
90-
- uses: actions/checkout@v4
90+
- uses: actions/checkout@v5
9191
- uses: dtolnay/rust-toolchain@stable
9292
- uses: Swatinem/rust-cache@v2
9393
with:
@@ -100,7 +100,7 @@ jobs:
100100
runs-on: ubuntu-latest
101101
timeout-minutes: 30
102102
steps:
103-
- uses: actions/checkout@v4
103+
- uses: actions/checkout@v5
104104
- uses: dtolnay/rust-toolchain@stable
105105
- uses: taiki-e/install-action@cargo-hack
106106
- uses: Swatinem/rust-cache@v2

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ lint-clippy: ## Run clippy on the codebase.
108108
.PHONY: lint-typos
109109
lint-typos: ## Run typos on the codebase.
110110
@command -v typos >/dev/null || { \
111-
echo "typos not found. Please install it by running the command `cargo install typos-cli` or refer to the following link for more information: https://github.com/crate-ci/typos" \
111+
echo "typos not found. Please install it by running the command `cargo install typos-cli` or refer to the following link for more information: https://github.com/crate-ci/typos"; \
112112
exit 1; \
113113
}
114114
typos

crates/config/src/soldeer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub struct MapDependency {
3232

3333
/// Type for Soldeer configs, under dependencies tag in the foundry.toml
3434
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
35-
pub struct SoldeerDependencyConfig(BTreeMap<String, SoldeerDependencyValue>);
35+
pub struct SoldeerDependencyConfig(pub BTreeMap<String, SoldeerDependencyValue>);
3636

3737
impl AsRef<Self> for SoldeerDependencyConfig {
3838
fn as_ref(&self) -> &Self {

0 commit comments

Comments
 (0)