Skip to content

Commit a0d0e88

Browse files
committed
Merge remote-tracking branch 'origin/unstable' into vm-voluntary-exit
2 parents 49e30fd + ca8eaea commit a0d0e88

File tree

585 files changed

+21645
-41734
lines changed

Some content is hidden

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

585 files changed

+21645
-41734
lines changed

.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[env]
22
# Set the number of arenas to 16 when using jemalloc.
33
JEMALLOC_SYS_WITH_MALLOC_CONF = "abort_conf:true,narenas:16"
4-

.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/workflows/book.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
jobs:
1313
build-and-upload-to-s3:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
1717

.github/workflows/test-suite.yml

Lines changed: 4 additions & 5 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
@@ -65,8 +65,7 @@ jobs:
6565
- name: Install dependencies
6666
run: apt update && apt install -y cmake libclang-dev
6767
- name: Check for deadlocks
68-
run: |
69-
cargo lockbud -k deadlock -b -l tokio_util
68+
run: ./scripts/ci/check-lockbud.sh
7069

7170
target-branch-check:
7271
name: target-branch-check

0 commit comments

Comments
 (0)