Merge remote-tracking branch 'origin/unstable' into tree-states

dapplion · Nov 12, 2023 · 9cdc4b9 · 9cdc4b9
2 parents d36ebba + 051c3e8
commit 9cdc4b9
Show file tree

Hide file tree

Showing 161 changed files with 3,632 additions and 2,224 deletions.
diff --git a/.github/workflows/local-testnet.yml b/.github/workflows/local-testnet.yml
@@ -20,6 +20,9 @@ jobs:
           - ubuntu-22.04
           - macos-12
     runs-on: ${{ matrix.os }}
+    env:
+      # Enable portable to prevent issues with caching `blst` for the wrong CPU type
+      FEATURES: portable,jemalloc
     steps:
       - uses: actions/checkout@v3
 

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -26,6 +26,8 @@ env:
   WATCH_HOST: ${{ github.repository == 'sigp/lighthouse' && 'host.docker.internal' || 'localhost' }}
   # Disable incremental compilation
   CARGO_INCREMENTAL: 0
+  # Enable portable to prevent issues with caching `blst` for the wrong CPU type
+  TEST_FEATURES: portable
 jobs:
   target-branch-check:
     name: target-branch-check
@@ -286,6 +288,9 @@ jobs:
   doppelganger-protection-test:
     name: doppelganger-protection-test
     runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "small"]') || 'ubuntu-latest'  }}
+    env:
+      # Enable portable to prevent issues with caching `blst` for the wrong CPU type
+      FEATURES: jemalloc,portable
     steps:
     - uses: actions/checkout@v3
     - name: Get latest version of stable Rust
@@ -304,8 +309,7 @@ jobs:
       run: |
           make
     - name: Install lcli
-# TODO(jimmy): re-enable this once we merge deneb into unstable
-#      if: env.SELF_HOSTED_RUNNERS == 'false'
+      if: env.SELF_HOSTED_RUNNERS == 'false'
       run: make install-lcli
     - name: Run the doppelganger protection failure test script
       run: |
@@ -360,10 +364,8 @@ jobs:
       run:  make arbitrary-fuzz
     - name: Run cargo audit
       run: make audit-CI
-# TODO(sean): re-enable this when we can figure it out with c-kzg
-# Issue: https://github.com/sigp/lighthouse/issues/4440
-#    - name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
-#      run:  CARGO_HOME=$(readlink -f $HOME) make vendor
+    - name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
+      run:  CARGO_HOME=$(readlink -f $HOME) make vendor
   check-msrv:
     name: check-msrv
     runs-on: ubuntu-latest