Skip to content

Commit 6c8def2

Browse files
jimmygchenjimmygchen
committed
Merge remote-tracking branch 'origin/unstable' into sync-metadata
# Conflicts: # beacon_node/lighthouse_network/src/service/api_types.rs # beacon_node/lighthouse_network/src/service/mod.rs
2 parents 120b8db + c8224c8 commit 6c8def2

File tree

566 files changed

+19356
-40818
lines changed

Some content is hidden

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

566 files changed

+19356
-40818
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
beacon_node/network/ @jxs
2-
beacon_node/lighthouse_network/ @jxs
1+
/beacon_node/network/ @jxs
2+
/beacon_node/lighthouse_network/ @jxs

‎.github/mergify.yml‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
pull_request_rules:
2+
- name: Ask to resolve conflict
3+
conditions:
4+
- conflict
5+
- -author=dependabot[bot]
6+
- or:
7+
- -draft # Don't report conflicts on regular draft.
8+
- and: # Do report conflicts on draft that are scheduled for the next major release.
9+
- draft
10+
- milestone~=v[0-9]\.[0-9]{2}
11+
actions:
12+
comment:
13+
message: This pull request has merge conflicts. Could you please resolve them
14+
@{{author}}? 🙏
15+
16+
- name: Approve trivial maintainer PRs
17+
conditions:
18+
- base!=stable
19+
- label=trivial
20+
- author=@sigp/lighthouse
21+
- -conflict
22+
actions:
23+
review:
24+
type: APPROVE
25+
26+
- name: Add ready-to-merge labeled PRs to merge queue
27+
conditions:
28+
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
29+
- base!=stable
30+
- label=ready-for-merge
31+
- label!=do-not-merge
32+
actions:
33+
queue:
34+
135
queue_rules:
236
- name: default
337
batch_size: 8
@@ -6,14 +40,16 @@ queue_rules:
640
merge_method: squash
741
commit_message_template: |
842
{{ title }} (#{{ number }})
9-
10-
{% for commit in commits %}
11-
* {{ commit.commit_message }}
12-
{% endfor %}
43+
44+
{{ body | get_section("## Issue Addressed", "") }}
45+
46+
47+
{{ body | get_section("## Proposed Changes", "") }}
1348
queue_conditions:
1449
- "#approved-reviews-by >= 1"
1550
- "check-success=license/cla"
1651
- "check-success=target-branch-check"
52+
- "label!=do-not-merge"
1753
merge_conditions:
1854
- "check-success=test-suite-success"
1955
- "check-success=local-testnet-success"

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ jobs:
221221
|Non-Staking Users| <TODO>|---|
222222
223223
*See [Update
224-
Priorities](https://lighthouse-book.sigmaprime.io/installation-priorities.html)
224+
Priorities](https://lighthouse-book.sigmaprime.io/installation_priorities.html)
225225
more information about this table.*
226226
227227
## All Changes
@@ -230,19 +230,19 @@ jobs:
230230
231231
## Binaries
232232
233-
[See pre-built binaries documentation.](https://lighthouse-book.sigmaprime.io/installation-binaries.html)
233+
[See pre-built binaries documentation.](https://lighthouse-book.sigmaprime.io/installation_binaries.html)
234234
235235
The binaries are signed with Sigma Prime's PGP key: `15E66D941F697E28F49381F426416DC3F30674B0`
236236
237237
| System | Architecture | Binary | PGP Signature |
238238
|:---:|:---:|:---:|:---|
239-
| <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | 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) |
240-
| <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | 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) |
241-
| <img src="https://simpleicons.org/icons/raspberrypi.svg" style="width: 32px;"/> | 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) |
242-
| <img src="https://upload.wikimedia.org/wikipedia/commons/c/c4/Windows_logo_-_2021_%28Black%29.svg" style="width: 32px;"/> | 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) |
239+
| <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) |
240+
| <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) |
241+
| <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) |
242+
| <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) |
243243
| | | | |
244244
| **System** | **Option** | - | **Resource** |
245-
| <img src="https://simpleicons.org/icons/docker.svg" style="width: 32px;"/> | Docker | [${{ env.VERSION }}](https://hub.docker.com/r/${{ env.IMAGE_NAME }}/tags?page=1&ordering=last_updated&name=${{ env.VERSION }}) | [${{ env.IMAGE_NAME }}](https://hub.docker.com/r/${{ env.IMAGE_NAME }}) |
245+
| <picture> <source media="(prefers-color-scheme: dark)" srcset="https://cdn.simpleicons.org/docker/white" > <source media="(prefers-color-scheme: light)" srcset="https://cdn.simpleicons.org/docker/black" > <img src="https://cdn.simpleicons.org/docker/black" width="32" alt="Docker logo"></picture> | Docker | [${{ env.VERSION }}](https://hub.docker.com/r/${{ env.IMAGE_NAME }}/tags?page=1&ordering=last_updated&name=${{ env.VERSION }}) | [${{ env.IMAGE_NAME }}](https://hub.docker.com/r/${{ env.IMAGE_NAME }}) |
246246
ENDBODY
247247
)
248248
assets=(./lighthouse-*.tar.gz*/lighthouse-*.tar.gz*)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ env:
1919
# Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
2020
RUSTFLAGS: "-D warnings -C debuginfo=0"
2121
# Prevent Github API rate limiting.
22-
LIGHTHOUSE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
# NOTE: this token is a personal access token on Jimmy's account due to the default GITHUB_TOKEN
23+
# not having access to other repositories. We should eventually devise a better solution here.
24+
LIGHTHOUSE_GITHUB_TOKEN: ${{ secrets.LIGHTHOUSE_GITHUB_TOKEN }}
2325
# Enable self-hosted runners for the sigp repo only.
2426
SELF_HOSTED_RUNNERS: ${{ github.repository == 'sigp/lighthouse' }}
25-
# Self-hosted runners need to reference a different host for `./watch` tests.
26-
WATCH_HOST: ${{ github.repository == 'sigp/lighthouse' && 'host.docker.internal' || 'localhost' }}
2727
# Disable incremental compilation
2828
CARGO_INCREMENTAL: 0
2929
# Enable portable to prevent issues with caching `blst` for the wrong CPU type

0 commit comments

Comments
 (0)