Skip to content

Commit 9cdc4b9

Browse files
committed
Merge remote-tracking branch 'origin/unstable' into tree-states
2 parents d36ebba + 051c3e8 commit 9cdc4b9

File tree

161 files changed

+3632
-2224
lines changed

Some content is hidden

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

161 files changed

+3632
-2224
lines changed

.github/workflows/local-testnet.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
- ubuntu-22.04
2121
- macos-12
2222
runs-on: ${{ matrix.os }}
23+
env:
24+
# Enable portable to prevent issues with caching `blst` for the wrong CPU type
25+
FEATURES: portable,jemalloc
2326
steps:
2427
- uses: actions/checkout@v3
2528

.github/workflows/test-suite.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ env:
2626
WATCH_HOST: ${{ github.repository == 'sigp/lighthouse' && 'host.docker.internal' || 'localhost' }}
2727
# Disable incremental compilation
2828
CARGO_INCREMENTAL: 0
29+
# Enable portable to prevent issues with caching `blst` for the wrong CPU type
30+
TEST_FEATURES: portable
2931
jobs:
3032
target-branch-check:
3133
name: target-branch-check
@@ -286,6 +288,9 @@ jobs:
286288
doppelganger-protection-test:
287289
name: doppelganger-protection-test
288290
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "small"]') || 'ubuntu-latest' }}
291+
env:
292+
# Enable portable to prevent issues with caching `blst` for the wrong CPU type
293+
FEATURES: jemalloc,portable
289294
steps:
290295
- uses: actions/checkout@v3
291296
- name: Get latest version of stable Rust
@@ -304,8 +309,7 @@ jobs:
304309
run: |
305310
make
306311
- name: Install lcli
307-
# TODO(jimmy): re-enable this once we merge deneb into unstable
308-
# if: env.SELF_HOSTED_RUNNERS == 'false'
312+
if: env.SELF_HOSTED_RUNNERS == 'false'
309313
run: make install-lcli
310314
- name: Run the doppelganger protection failure test script
311315
run: |
@@ -360,10 +364,8 @@ jobs:
360364
run: make arbitrary-fuzz
361365
- name: Run cargo audit
362366
run: make audit-CI
363-
# TODO(sean): re-enable this when we can figure it out with c-kzg
364-
# Issue: https://github.com/sigp/lighthouse/issues/4440
365-
# - name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
366-
# run: CARGO_HOME=$(readlink -f $HOME) make vendor
367+
- name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
368+
run: CARGO_HOME=$(readlink -f $HOME) make vendor
367369
check-msrv:
368370
name: check-msrv
369371
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)