Skip to content

Commit a9da143

Browse files
michaelsproulmichaelsproul
authored
Merge branch 'unstable' into blob-backfill
2 parents 515ef25 + 3e78034 commit a9da143

File tree

620 files changed

+11745
-9857
lines changed

Some content is hidden

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

620 files changed

+11745
-9857
lines changed

‎.github/workflows/book.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build-and-upload-to-s3:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717

1818
- name: Setup mdBook
1919
uses: peaceiris/actions-mdbook@v1

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
VERSION: ${{ needs.extract-version.outputs.VERSION }}
6565
VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
6666
steps:
67-
- uses: actions/checkout@v4
67+
- uses: actions/checkout@v5
6868
- name: Update Rust
6969
if: env.SELF_HOSTED_RUNNERS == 'false'
7070
run: rustup update stable

‎.github/workflows/linkcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424

2525
- name: Run mdbook server
2626
run: |

‎.github/workflows/local-testnet.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
dockerfile-ubuntu:
1717
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Build Docker image
2222
run: |
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-22.04
3535
needs: dockerfile-ubuntu
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838

3939
- name: Install Kurtosis
4040
run: |
@@ -102,7 +102,7 @@ jobs:
102102
needs: dockerfile-ubuntu
103103
runs-on: ubuntu-22.04
104104
steps:
105-
- uses: actions/checkout@v4
105+
- uses: actions/checkout@v5
106106

107107
- name: Install Kurtosis
108108
run: |
@@ -138,7 +138,7 @@ jobs:
138138
needs: dockerfile-ubuntu
139139
runs-on: ubuntu-22.04
140140
steps:
141-
- uses: actions/checkout@v4
141+
- uses: actions/checkout@v5
142142

143143
- name: Install Kurtosis
144144
run: |
@@ -181,7 +181,7 @@ jobs:
181181
matrix:
182182
network: [sepolia, devnet]
183183
steps:
184-
- uses: actions/checkout@v4
184+
- uses: actions/checkout@v5
185185

186186
- name: Install Kurtosis
187187
run: |
@@ -218,13 +218,12 @@ jobs:
218218
name: genesis-sync-test-${{ matrix.fork }}-${{ matrix.offline_secs }}s
219219
runs-on: ubuntu-latest
220220
needs: dockerfile-ubuntu
221-
if: contains(github.event.pull_request.labels.*.name, 'syncing')
222221
strategy:
223222
matrix:
224223
fork: [electra, fulu]
225224
offline_secs: [120, 300]
226225
steps:
227-
- uses: actions/checkout@v4
226+
- uses: actions/checkout@v5
228227

229228
- name: Install Kurtosis
230229
run: |
@@ -266,10 +265,11 @@ jobs:
266265
'run-local-testnet',
267266
'doppelganger-protection-success-test',
268267
'doppelganger-protection-failure-test',
268+
'genesis-sync-test'
269269
]
270270
steps:
271-
- uses: actions/checkout@v4
271+
- uses: actions/checkout@v5
272272
- name: Check that success job is dependent on all others
273273
run: |
274-
exclude_jobs='checkpoint-sync-test|genesis-sync-test'
274+
exclude_jobs='checkpoint-sync-test'
275275
./scripts/ci/check-success-job.sh ./.github/workflows/local-testnet.yml local-testnet-success "$exclude_jobs"

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
matrix:
3333
arch: [aarch64-unknown-linux-gnu,
3434
x86_64-unknown-linux-gnu,
35-
x86_64-apple-darwin,
3635
aarch64-apple-darwin,
3736
x86_64-windows]
3837
include:
@@ -42,9 +41,6 @@ jobs:
4241
- arch: x86_64-unknown-linux-gnu
4342
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
4443
profile: maxperf
45-
- arch: x86_64-apple-darwin
46-
runner: macos-13
47-
profile: maxperf
4844
- arch: aarch64-apple-darwin
4945
runner: macos-14
5046
profile: maxperf
@@ -56,7 +52,7 @@ jobs:
5652
needs: extract-version
5753
steps:
5854
- name: Checkout sources
59-
uses: actions/checkout@v4
55+
uses: actions/checkout@v5
6056
- name: Get latest version of stable Rust
6157
if: env.SELF_HOSTED_RUNNERS == 'false'
6258
run: rustup update stable
@@ -94,10 +90,6 @@ jobs:
9490
if: contains(matrix.arch, 'unknown-linux-gnu')
9591
run: mv target/${{ matrix.arch }}/${{ matrix.profile }}/lighthouse ~/.cargo/bin/lighthouse
9692

97-
- name: Build Lighthouse for x86_64-apple-darwin
98-
if: matrix.arch == 'x86_64-apple-darwin'
99-
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
100-
10193
- name: Build Lighthouse for aarch64-apple-darwin
10294
if: matrix.arch == 'aarch64-apple-darwin'
10395
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
@@ -168,7 +160,7 @@ jobs:
168160
steps:
169161
# This is necessary for generating the changelog. It has to come before "Download Artifacts" or else it deletes the artifacts.
170162
- name: Checkout sources
171-
uses: actions/checkout@v4
163+
uses: actions/checkout@v5
172164
with:
173165
fetch-depth: 0
174166

@@ -244,7 +236,6 @@ jobs:
244236
245237
| System | Architecture | Binary | PGP Signature |
246238
|:---:|:---:|:---:|:---|
247-
| <picture> <source media="(prefers-color-scheme: dark)" srcset="https://cdn.simpleicons.org/apple/white" > <source media="(prefers-color-scheme: light)" srcset="https://cdn.simpleicons.org/apple" ><img src="https://cdn.simpleicons.org/apple" width="32" alt="Apple logo"> </picture> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz.asc) |
248239
| <picture> <source media="(prefers-color-scheme: dark)" srcset="https://cdn.simpleicons.org/apple/white" > <source media="(prefers-color-scheme: light)" srcset="https://cdn.simpleicons.org/apple" ><img src="https://cdn.simpleicons.org/apple" width="32" alt="Apple logo"> </picture> | aarch64 | [lighthouse-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz.asc) |
249240
| <picture> <source media="(prefers-color-scheme: dark)" srcset="https://cdn.simpleicons.org/linux/white" > <source media="(prefers-color-scheme: light)" srcset="https://cdn.simpleicons.org/linux/black" ><img src="https://cdn.simpleicons.org/linux" width="32" alt="Linux logo"> </picture> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc) |
250241
| <picture> <source media="(prefers-color-scheme: dark)" srcset="https://cdn.simpleicons.org/raspberrypi/white" > <source media="(prefers-color-scheme: light)" srcset="https://cdn.simpleicons.org/raspberrypi/black" > <img src="https://cdn.simpleicons.org/raspberrypi" width="32" alt="Raspberrypi logo"> </picture> | aarch64 | [lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz.asc) |

‎.github/workflows/test-suite.yml‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
# Use self-hosted runners only on the sigp repo.
8282
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
8383
steps:
84-
- uses: actions/checkout@v4
84+
- uses: actions/checkout@v5
8585
# Set Java version to 21. (required since Web3Signer 24.12.0).
8686
- uses: actions/setup-java@v4
8787
with:
@@ -105,14 +105,15 @@ jobs:
105105
run: make nextest-release
106106
- name: Show cache stats
107107
if: env.SELF_HOSTED_RUNNERS == 'true'
108+
continue-on-error: true
108109
run: sccache --show-stats
109110
release-tests-windows:
110111
name: release-tests-windows
111112
needs: [check-labels]
112113
if: needs.check-labels.outputs.skip_ci != 'true'
113114
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "CI"]') || 'windows-2019' }}
114115
steps:
115-
- uses: actions/checkout@v4
116+
- uses: actions/checkout@v5
116117
- name: Get latest version of stable Rust
117118
if: env.SELF_HOSTED_RUNNERS == 'false'
118119
uses: moonrepo/setup-rust@v1
@@ -136,6 +137,7 @@ jobs:
136137
run: make nextest-release
137138
- name: Show cache stats
138139
if: env.SELF_HOSTED_RUNNERS == 'true'
140+
continue-on-error: true
139141
run: sccache --show-stats
140142
beacon-chain-tests:
141143
name: beacon-chain-tests
@@ -146,7 +148,7 @@ jobs:
146148
env:
147149
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
148150
steps:
149-
- uses: actions/checkout@v4
151+
- uses: actions/checkout@v5
150152
- name: Get latest version of stable Rust
151153
if: env.SELF_HOSTED_RUNNERS == 'false'
152154
uses: moonrepo/setup-rust@v1
@@ -158,6 +160,7 @@ jobs:
158160
run: make test-beacon-chain
159161
- name: Show cache stats
160162
if: env.SELF_HOSTED_RUNNERS == 'true'
163+
continue-on-error: true
161164
run: sccache --show-stats
162165
http-api-tests:
163166
name: http-api-tests
@@ -168,7 +171,7 @@ jobs:
168171
env:
169172
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170173
steps:
171-
- uses: actions/checkout@v4
174+
- uses: actions/checkout@v5
172175
- name: Get latest version of stable Rust
173176
if: env.SELF_HOSTED_RUNNERS == 'false'
174177
uses: moonrepo/setup-rust@v1
@@ -180,6 +183,7 @@ jobs:
180183
run: make test-http-api
181184
- name: Show cache stats
182185
if: env.SELF_HOSTED_RUNNERS == 'true'
186+
continue-on-error: true
183187
run: sccache --show-stats
184188
op-pool-tests:
185189
name: op-pool-tests
@@ -189,7 +193,7 @@ jobs:
189193
env:
190194
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
191195
steps:
192-
- uses: actions/checkout@v4
196+
- uses: actions/checkout@v5
193197
- name: Get latest version of stable Rust
194198
uses: moonrepo/setup-rust@v1
195199
with:
@@ -206,7 +210,7 @@ jobs:
206210
env:
207211
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
208212
steps:
209-
- uses: actions/checkout@v4
213+
- uses: actions/checkout@v5
210214
- name: Get latest version of stable Rust
211215
uses: moonrepo/setup-rust@v1
212216
with:
@@ -234,7 +238,7 @@ jobs:
234238
env:
235239
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
236240
steps:
237-
- uses: actions/checkout@v4
241+
- uses: actions/checkout@v5
238242
- name: Get latest version of stable Rust
239243
uses: moonrepo/setup-rust@v1
240244
with:
@@ -252,7 +256,7 @@ jobs:
252256
env:
253257
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
254258
steps:
255-
- uses: actions/checkout@v4
259+
- uses: actions/checkout@v5
256260
- name: Get latest version of stable Rust
257261
if: env.SELF_HOSTED_RUNNERS == 'false'
258262
uses: moonrepo/setup-rust@v1
@@ -268,14 +272,15 @@ jobs:
268272
run: make nextest-debug
269273
- name: Show cache stats
270274
if: env.SELF_HOSTED_RUNNERS == 'true'
275+
continue-on-error: true
271276
run: sccache --show-stats
272277
state-transition-vectors-ubuntu:
273278
name: state-transition-vectors-ubuntu
274279
needs: [check-labels]
275280
if: needs.check-labels.outputs.skip_ci != 'true'
276281
runs-on: ubuntu-latest
277282
steps:
278-
- uses: actions/checkout@v4
283+
- uses: actions/checkout@v5
279284
- name: Get latest version of stable Rust
280285
uses: moonrepo/setup-rust@v1
281286
with:
@@ -292,7 +297,7 @@ jobs:
292297
env:
293298
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
294299
steps:
295-
- uses: actions/checkout@v4
300+
- uses: actions/checkout@v5
296301
- name: Get latest version of stable Rust
297302
if: env.SELF_HOSTED_RUNNERS == 'false'
298303
uses: moonrepo/setup-rust@v1
@@ -304,14 +309,15 @@ jobs:
304309
run: make nextest-ef
305310
- name: Show cache stats
306311
if: env.SELF_HOSTED_RUNNERS == 'true'
312+
continue-on-error: true
307313
run: sccache --show-stats
308314
basic-simulator-ubuntu:
309315
name: basic-simulator-ubuntu
310316
needs: [check-labels]
311317
if: needs.check-labels.outputs.skip_ci != 'true'
312318
runs-on: ubuntu-latest
313319
steps:
314-
- uses: actions/checkout@v4
320+
- uses: actions/checkout@v5
315321
- name: Get latest version of stable Rust
316322
uses: moonrepo/setup-rust@v1
317323
with:
@@ -332,7 +338,7 @@ jobs:
332338
if: needs.check-labels.outputs.skip_ci != 'true'
333339
runs-on: ubuntu-latest
334340
steps:
335-
- uses: actions/checkout@v4
341+
- uses: actions/checkout@v5
336342
- name: Get latest version of stable Rust
337343
uses: moonrepo/setup-rust@v1
338344
with:
@@ -353,7 +359,7 @@ jobs:
353359
if: needs.check-labels.outputs.skip_ci != 'true'
354360
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "small"]') || 'ubuntu-latest' }}
355361
steps:
356-
- uses: actions/checkout@v4
362+
- uses: actions/checkout@v5
357363
- name: Get latest version of stable Rust
358364
if: env.SELF_HOSTED_RUNNERS == 'false'
359365
uses: moonrepo/setup-rust@v1
@@ -374,7 +380,7 @@ jobs:
374380
env:
375381
CARGO_INCREMENTAL: 1
376382
steps:
377-
- uses: actions/checkout@v4
383+
- uses: actions/checkout@v5
378384
- name: Get latest version of stable Rust
379385
uses: moonrepo/setup-rust@v1
380386
with:
@@ -404,7 +410,7 @@ jobs:
404410
name: check-msrv
405411
runs-on: ubuntu-latest
406412
steps:
407-
- uses: actions/checkout@v4
413+
- uses: actions/checkout@v5
408414
- name: Install Rust at Minimum Supported Rust Version (MSRV)
409415
run: |
410416
metadata=$(cargo metadata --no-deps --format-version 1)
@@ -418,7 +424,7 @@ jobs:
418424
if: needs.check-labels.outputs.skip_ci != 'true'
419425
runs-on: ubuntu-latest
420426
steps:
421-
- uses: actions/checkout@v4
427+
- uses: actions/checkout@v5
422428
- name: Get latest version of nightly Rust
423429
uses: moonrepo/setup-rust@v1
424430
with:
@@ -446,7 +452,7 @@ jobs:
446452
if: needs.check-labels.outputs.skip_ci != 'true'
447453
runs-on: ubuntu-latest
448454
steps:
449-
- uses: actions/checkout@v4
455+
- uses: actions/checkout@v5
450456
- name: Install dependencies
451457
run: sudo apt update && sudo apt install -y git gcc g++ make cmake pkg-config llvm-dev libclang-dev clang
452458
- name: Use Rust beta
@@ -459,7 +465,7 @@ jobs:
459465
if: needs.check-labels.outputs.skip_ci != 'true'
460466
runs-on: ubuntu-latest
461467
steps:
462-
- uses: actions/checkout@v4
468+
- uses: actions/checkout@v5
463469
- name: Get latest version of stable Rust
464470
uses: moonrepo/setup-rust@v1
465471
with:
@@ -473,7 +479,7 @@ jobs:
473479
if: needs.check-labels.outputs.skip_ci != 'true'
474480
runs-on: ubuntu-latest
475481
steps:
476-
- uses: actions/checkout@v4
482+
- uses: actions/checkout@v5
477483
- name: Get latest version of stable Rust
478484
uses: moonrepo/setup-rust@v1
479485
with:
@@ -513,6 +519,6 @@ jobs:
513519
'cargo-sort',
514520
]
515521
steps:
516-
- uses: actions/checkout@v4
522+
- uses: actions/checkout@v5
517523
- name: Check that success job is dependent on all others
518524
run: ./scripts/ci/check-success-job.sh ./.github/workflows/test-suite.yml test-suite-success

0 commit comments

Comments
 (0)