Skip to content

Commit a642bd7

Browse files
realbigseanrealbigsean
authored
Merge pull request #4781 from jimmygchen/merge-unstable-to-deneb-20230926
Merge `unstable` into `deneb-free-blobs`
2 parents 9244f7f + 8f07a96 commit a642bd7

File tree

165 files changed

+3890
-3052
lines changed

Some content is hidden

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

165 files changed

+3890
-3052
lines changed

‎.github/workflows/docker.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
build-docker-single-arch:
5858
name: build-docker-${{ matrix.binary }}${{ matrix.features.version_suffix }}
5959
# Use self-hosted runners only on the sigp repo.
60-
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "large"]') || 'ubuntu-22.04' }}
60+
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release"]') || 'ubuntu-22.04' }}
6161
strategy:
6262
matrix:
6363
binary: [aarch64,
@@ -79,7 +79,7 @@ jobs:
7979
steps:
8080
- uses: actions/checkout@v3
8181
- name: Update Rust
82-
if: env.SELF_HOSTED_RUNNERS == false
82+
if: env.SELF_HOSTED_RUNNERS == 'false'
8383
run: rustup update stable
8484
- name: Dockerhub login
8585
run: |
@@ -107,9 +107,11 @@ jobs:
107107
run: echo "MODERNITY_SUFFIX=-modern" >> $GITHUB_ENV;
108108

109109
- name: Install QEMU
110+
if: env.SELF_HOSTED_RUNNERS == 'false'
110111
run: sudo apt-get update && sudo apt-get install -y qemu-user-static
111112

112113
- name: Set up Docker Buildx
114+
if: env.SELF_HOSTED_RUNNERS == 'false'
113115
uses: docker/setup-buildx-action@v2
114116

115117
- name: Build and push

‎.github/workflows/release.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ env:
1414
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
1515
REPO_NAME: ${{ github.repository_owner }}/lighthouse
1616
IMAGE_NAME: ${{ github.repository_owner }}/lighthouse
17+
# Enable self-hosted runners for the sigp repo only.
18+
SELF_HOSTED_RUNNERS: ${{ github.repository == 'sigp/lighthouse' }}
1719

1820
jobs:
1921
extract-version:
@@ -38,44 +40,45 @@ jobs:
3840
x86_64-windows-portable]
3941
include:
4042
- arch: aarch64-unknown-linux-gnu
41-
platform: ubuntu-latest
43+
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
4244
profile: maxperf
4345
- arch: aarch64-unknown-linux-gnu-portable
44-
platform: ubuntu-latest
46+
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
4547
profile: maxperf
4648
- arch: x86_64-unknown-linux-gnu
47-
platform: ubuntu-latest
49+
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
4850
profile: maxperf
4951
- arch: x86_64-unknown-linux-gnu-portable
50-
platform: ubuntu-latest
52+
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
5153
profile: maxperf
5254
- arch: x86_64-apple-darwin
53-
platform: macos-latest
55+
runner: macos-latest
5456
profile: maxperf
5557
- arch: x86_64-apple-darwin-portable
56-
platform: macos-latest
58+
runner: macos-latest
5759
profile: maxperf
5860
- arch: x86_64-windows
59-
platform: windows-2019
61+
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "release"]') || 'windows-2019' }}
6062
profile: maxperf
6163
- arch: x86_64-windows-portable
62-
platform: windows-2019
64+
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "release"]') || 'windows-2019' }}
6365
profile: maxperf
6466

65-
runs-on: ${{ matrix.platform }}
67+
runs-on: ${{ matrix.runner }}
6668
needs: extract-version
6769
steps:
6870
- name: Checkout sources
6971
uses: actions/checkout@v3
7072
- name: Get latest version of stable Rust
73+
if: env.SELF_HOSTED_RUNNERS == 'false'
7174
run: rustup update stable
7275

7376
# ==============================
7477
# Windows dependencies
7578
# ==============================
7679

7780
- uses: KyleMayes/install-llvm-action@v1
78-
if: startsWith(matrix.arch, 'x86_64-windows')
81+
if: env.SELF_HOSTED_RUNNERS == 'false' && startsWith(matrix.arch, 'x86_64-windows')
7982
with:
8083
version: "15.0"
8184
directory: ${{ runner.temp }}/llvm

‎.github/workflows/test-suite.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
release-tests-ubuntu:
5959
name: release-tests-ubuntu
6060
# Use self-hosted runners only on the sigp repo.
61-
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "large"]') || 'ubuntu-latest' }}
61+
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
6262
needs: cargo-fmt
6363
steps:
6464
- uses: actions/checkout@v3
@@ -73,7 +73,7 @@ jobs:
7373
run: make test-release
7474
release-tests-windows:
7575
name: release-tests-windows
76-
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows"]') || 'windows-2019' }}
76+
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "CI"]') || 'windows-2019' }}
7777
needs: cargo-fmt
7878
steps:
7979
- uses: actions/checkout@v3
@@ -98,7 +98,7 @@ jobs:
9898
beacon-chain-tests:
9999
name: beacon-chain-tests
100100
# Use self-hosted runners only on the sigp repo.
101-
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "large"]') || 'ubuntu-latest' }}
101+
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
102102
needs: cargo-fmt
103103
steps:
104104
- uses: actions/checkout@v3
@@ -140,7 +140,7 @@ jobs:
140140
debug-tests-ubuntu:
141141
name: debug-tests-ubuntu
142142
# Use self-hosted runners only on the sigp repo.
143-
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "large"]') || 'ubuntu-latest' }}
143+
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
144144
needs: cargo-fmt
145145
steps:
146146
- uses: actions/checkout@v3
@@ -166,7 +166,7 @@ jobs:
166166
ef-tests-ubuntu:
167167
name: ef-tests-ubuntu
168168
# Use self-hosted runners only on the sigp repo.
169-
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "small"]') || 'ubuntu-latest' }}
169+
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "small"]') || 'ubuntu-latest' }}
170170
needs: cargo-fmt
171171
steps:
172172
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)