Skip to content

Commit 0245891

Browse files
authored
Merge branch 'develop' into patch-3
2 parents 590cc2d + de04c66 commit 0245891

File tree

128 files changed

+6026
-2937
lines changed

Some content is hidden

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

128 files changed

+6026
-2937
lines changed

.github/workflows/ci.yml

+13-12
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ jobs:
3838

3939
test-default:
4040
name: Test Default
41+
if: false
4142
needs: [runner]
4243
runs-on: ${{ matrix.os }}
43-
concurrency: ${{ needs.runner.outputs.concurrency-group2 }}
44+
concurrency: ${{ needs.runner.outputs.concurrency-group1 }}
4445
strategy:
4546
matrix:
46-
os: ${{ fromJSON(needs.runner.outputs.runner-matrix2) }}
47+
os: ${{ fromJSON(needs.runner.outputs.runner-matrix1) }}
4748

4849
steps:
4950
- uses: actions/checkout@v4
@@ -52,12 +53,12 @@ jobs:
5253
echo "HOME=/home/CI" >> $GITHUB_ENV
5354
- uses: dtolnay/rust-toolchain@master
5455
with:
55-
toolchain: nightly-2023-12-03
56+
toolchain: nightly-2024-07-07
5657
- name: Setup golang
5758
uses: actions/setup-go@v3
5859
with:
5960
cache: false
60-
go-version: ~1.21
61+
go-version: ~1.22
6162
# Go cache for building geth-utils
6263
- name: Go cache
6364
uses: actions/cache@v3
@@ -83,10 +84,10 @@ jobs:
8384
name: Test Scroll
8485
needs: [runner]
8586
runs-on: ${{ matrix.os }}
86-
concurrency: ${{ needs.runner.outputs.concurrency-group1 }}
87+
concurrency: ${{ needs.runner.outputs.concurrency-group2 }}
8788
strategy:
8889
matrix:
89-
os: ${{ fromJSON(needs.runner.outputs.runner-matrix1) }}
90+
os: ${{ fromJSON(needs.runner.outputs.runner-matrix2) }}
9091

9192
steps:
9293
- uses: actions/checkout@v4
@@ -95,12 +96,12 @@ jobs:
9596
echo "HOME=/home/CI" >> $GITHUB_ENV
9697
- uses: dtolnay/rust-toolchain@master
9798
with:
98-
toolchain: nightly-2023-12-03
99+
toolchain: nightly-2024-07-07
99100
- name: Setup golang
100101
uses: actions/setup-go@v3
101102
with:
102103
cache: false
103-
go-version: ~1.21
104+
go-version: ~1.22
104105
# Go cache for building geth-utils
105106
- name: Go cache
106107
uses: actions/cache@v3
@@ -146,7 +147,7 @@ jobs:
146147
- uses: actions/checkout@v4
147148
- uses: dtolnay/rust-toolchain@master
148149
with:
149-
toolchain: nightly-2023-12-03
150+
toolchain: nightly-2024-07-07
150151
- name: Add target
151152
run: rustup target add ${{ matrix.target }}
152153
# Go cache for building geth-utils
@@ -183,7 +184,7 @@ jobs:
183184
- uses: actions/checkout@v4
184185
- uses: dtolnay/rust-toolchain@master
185186
with:
186-
toolchain: nightly-2023-12-03
187+
toolchain: nightly-2024-07-07
187188
# Go cache for building geth-utils
188189
- name: Go cache
189190
uses: actions/cache@v3
@@ -216,7 +217,7 @@ jobs:
216217
- uses: actions/checkout@v4
217218
- uses: dtolnay/rust-toolchain@master
218219
with:
219-
toolchain: nightly-2023-12-03
220+
toolchain: nightly-2024-07-07
220221
# Go cache for building geth-utils
221222
- name: Go cache
222223
uses: actions/cache@v3
@@ -253,7 +254,7 @@ jobs:
253254
- uses: actions/checkout@v4
254255
- uses: dtolnay/rust-toolchain@master
255256
with:
256-
toolchain: nightly-2023-12-03
257+
toolchain: nightly-2024-07-07
257258
components: rustfmt
258259
# Go cache for building geth-utils
259260
- name: Go cache

.github/workflows/integration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- uses: actions/checkout@v4
6262
- uses: dtolnay/rust-toolchain@master
6363
with:
64-
toolchain: nightly-2023-12-03
64+
toolchain: nightly-2024-07-07
6565
- name: Setup golang
6666
uses: actions/setup-go@v3
6767
with:

.github/workflows/lints.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v4
4444
- uses: dtolnay/rust-toolchain@master
4545
with:
46-
toolchain: nightly-2023-12-03
46+
toolchain: nightly-2024-07-07
4747
components: clippy
4848
# Go cache for building geth-utils
4949
- name: Go cache

.github/workflows/test-features.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/checkout@v4
4343
- uses: dtolnay/rust-toolchain@master
4444
with:
45-
toolchain: nightly-2023-12-03
45+
toolchain: nightly-2024-07-07
4646

4747
# Go cache for building geth-utils
4848
- name: Go cache

0 commit comments

Comments
 (0)