Merge branch 'unstable' into vc-fallback-test

# Conflicts: # Cargo.lock # validator_client/Cargo.toml # validator_client/src/beacon_node_fallback.rs # validator_client/src/notifier.rs
sigp · Nov 6, 2024 · 6ea45b5 · 6ea45b5
2 parents 9b81cc0 + d8dbda3
commit 6ea45b5
Show file tree

Hide file tree

Showing 241 changed files with 6,970 additions and 5,951 deletions.
diff --git a/.github/workflows/local-testnet.yml b/.github/workflows/local-testnet.yml
@@ -41,7 +41,7 @@ jobs:
           sudo add-apt-repository ppa:rmescandon/yq
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
-          sudo apt install -y kurtosis-cli yq
+          sudo apt install -y kurtosis-cli=1.3.1 yq
           kurtosis analytics disable
 
       - name: Download Docker image artifact
@@ -88,7 +88,7 @@ jobs:
           sudo add-apt-repository ppa:rmescandon/yq
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
-          sudo apt install -y kurtosis-cli yq
+          sudo apt install -y kurtosis-cli=1.3.1 yq
           kurtosis analytics disable
 
       - name: Download Docker image artifact
@@ -124,7 +124,7 @@ jobs:
           sudo add-apt-repository ppa:rmescandon/yq
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
-          sudo apt install -y kurtosis-cli yq
+          sudo apt install -y kurtosis-cli=1.3.1 yq
           kurtosis analytics disable
 
       - name: Download Docker image artifact

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -54,6 +54,20 @@ jobs:
          done
          echo "skip_ci=$SKIP_CI" >> $GITHUB_OUTPUT
 
+  lockbud:
+    name: lockbud
+    runs-on: ubuntu-latest
+    container:
+      image: sigmaprime/lockbud:latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        run: apt update && apt install -y cmake
+      - name: Generate code coverage
+        run: |
+          cargo lockbud -k deadlock -b -l tokio_util
+
   target-branch-check:
     name: target-branch-check
     runs-on: ubuntu-latest
@@ -173,8 +187,19 @@ jobs:
         channel: stable
         cache-target: release
         bins: cargo-nextest
+    - name: Create CI logger dir
+      run: mkdir ${{ runner.temp }}/network_test_logs
     - name: Run network tests for all known forks
       run: make test-network
+      env:
+        TEST_FEATURES: portable,ci_logger
+        CI_LOGGER_DIR: ${{ runner.temp }}/network_test_logs
+    - name: Upload logs
+      uses: actions/upload-artifact@v4
+      with:
+        name: network_test_logs
+        path: ${{ runner.temp }}/network_test_logs
+
   slasher-tests:
     name: slasher-tests
     needs: [check-labels]
@@ -395,7 +420,7 @@ jobs:
         channel: stable
         cache-target: release
     - name: Run Makefile to trigger the bash script
-      run: make cli
+      run: make cli-local
   # This job succeeds ONLY IF all others succeed. It is used by the merge queue to determine whether
   # a PR is safe to merge. New jobs should be added here.
   test-suite-success:
@@ -422,6 +447,7 @@ jobs:
       'cargo-udeps',
       'compile-with-beta-compiler',
       'cli-check',
+      'lockbud',
     ]
     steps:
       - uses: actions/checkout@v4