Skip to content

Commit 6fd11d9

Browse files
Merge branch 'unstable' into import-blobs-api
2 parents 3408cbf + c2c7fb8 commit 6fd11d9

File tree

145 files changed

+4967
-3209
lines changed

Some content is hidden

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

145 files changed

+4967
-3209
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
arch: [aarch64-unknown-linux-gnu,
3434
x86_64-unknown-linux-gnu,
3535
x86_64-apple-darwin,
36+
aarch64-apple-darwin,
3637
x86_64-windows]
3738
include:
3839
- arch: aarch64-unknown-linux-gnu
@@ -44,6 +45,9 @@ jobs:
4445
- arch: x86_64-apple-darwin
4546
runner: macos-13
4647
profile: maxperf
48+
- arch: aarch64-apple-darwin
49+
runner: macos-14
50+
profile: maxperf
4751
- arch: x86_64-windows
4852
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "release"]') || 'windows-2019' }}
4953
profile: maxperf
@@ -94,6 +98,10 @@ jobs:
9498
if: matrix.arch == 'x86_64-apple-darwin'
9599
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
96100

101+
- name: Build Lighthouse for aarch64-apple-darwin
102+
if: matrix.arch == 'aarch64-apple-darwin'
103+
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
104+
97105
- name: Build Lighthouse for Windows
98106
if: matrix.arch == 'x86_64-windows'
99107
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
@@ -237,6 +245,7 @@ jobs:
237245
| System | Architecture | Binary | PGP Signature |
238246
|:---:|:---:|:---:|:---|
239247
| <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) |
248+
| <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) |
240249
| <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) |
241250
| <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) |
242251
| <picture> <source media="(prefers-color-scheme: dark)" srcset="https://upload.wikimedia.org/wikipedia/commons/8/87/Windows_logo_-_2021.svg"> <source media="(prefers-color-scheme: light)" srcset="https://upload.wikimedia.org/wikipedia/commons/c/c4/Windows_logo_-_2021_%28Black%29.svg"> <img src="https://upload.wikimedia.org/wikipedia/commons/c/c4/Windows_logo_-_2021_%28Black%29.svg" width="32" alt="Windows logo"> </picture> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz.asc) |

.github/workflows/test-suite.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,15 @@ jobs:
295295
with:
296296
channel: stable
297297
cache-target: release
298-
- name: Run a basic beacon chain sim that starts from Bellatrix
299-
run: cargo run --release --bin simulator basic-sim
298+
- name: Create log dir
299+
run: mkdir ${{ runner.temp }}/basic_simulator_logs
300+
- name: Run a basic beacon chain sim that starts from Deneb
301+
run: cargo run --release --bin simulator basic-sim --disable-stdout-logging --log-dir ${{ runner.temp }}/basic_simulator_logs
302+
- name: Upload logs
303+
uses: actions/upload-artifact@v4
304+
with:
305+
name: basic_simulator_logs
306+
path: ${{ runner.temp }}/basic_simulator_logs
300307
fallback-simulator-ubuntu:
301308
name: fallback-simulator-ubuntu
302309
needs: [check-labels]
@@ -309,8 +316,15 @@ jobs:
309316
with:
310317
channel: stable
311318
cache-target: release
319+
- name: Create log dir
320+
run: mkdir ${{ runner.temp }}/fallback_simulator_logs
312321
- name: Run a beacon chain sim which tests VC fallback behaviour
313-
run: cargo run --release --bin simulator fallback-sim
322+
run: cargo run --release --bin simulator fallback-sim --disable-stdout-logging --log-dir ${{ runner.temp }}/fallback_simulator_logs
323+
- name: Upload logs
324+
uses: actions/upload-artifact@v4
325+
with:
326+
name: fallback_simulator_logs
327+
path: ${{ runner.temp }}/fallback_simulator_logs
314328
execution-engine-integration-ubuntu:
315329
name: execution-engine-integration-ubuntu
316330
needs: [check-labels]

0 commit comments

Comments
 (0)