Merge branch 'main' into rlimit-0.7.0

ZcashFoundation · Feb 20, 2022 · 9cf0546 · 9cf0546
2 parents c047205 + ab03a37
commit 9cf0546
Show file tree

Hide file tree

Showing 17 changed files with 208 additions and 117 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,30 +1,54 @@
 queue_rules:
   - name: urgent
+    allow_inplace_checks: False
+    allow_checks_interruption: False
     speculative_checks: 2
     batch_size: 2
     conditions:
-      - check-success=Test (+stable) on ubuntu-latest
-      - check-success=Test (+stable) on macOS-latest
-      - check-success=Test (+stable) on windows-latest
-      - check-success=Coverage (+nightly)
+      - check-success=Test all
+      - check-success=Test with fake activation heights
+      - check-success=Test full validation sync from cached state
+      - check-success=Test stable zebra-state with fake activation heights on ubuntu-latest
+      - check-success=Test stable on ubuntu-latest
+      - check-success=Test stable on macOS-latest
+      - check-success=Test stable on windows-latest
+      - check-success=Coverage nightly
+      - check-success=Clippy
+      - check-success=Rustfmt
 
   - name: medium
+    allow_inplace_checks: False
+    allow_checks_interruption: False
     speculative_checks: 2
     batch_size: 3
     conditions:
-      - check-success=Test (+stable) on ubuntu-latest
-      - check-success=Test (+stable) on macOS-latest
-      - check-success=Test (+stable) on windows-latest
-      - check-success=Coverage (+nightly)
+      - check-success=Test all
+      - check-success=Test with fake activation heights
+      - check-success=Test full validation sync from cached state
+      - check-success=Test stable zebra-state with fake activation heights on ubuntu-latest
+      - check-success=Test stable on ubuntu-latest
+      - check-success=Test stable on macOS-latest
+      - check-success=Test stable on windows-latest
+      - check-success=Coverage nightly
+      - check-success=Clippy
+      - check-success=Rustfmt
 
   - name: low
+    allow_inplace_checks: False
+    allow_checks_interruption: False
     speculative_checks: 2
     batch_size: 4
     conditions:
-      - check-success=Test (+stable) on ubuntu-latest
-      - check-success=Test (+stable) on macOS-latest
-      - check-success=Test (+stable) on windows-latest
-      - check-success=Coverage (+nightly)
+      - check-success=Test all
+      - check-success=Test with fake activation heights
+      - check-success=Test full validation sync from cached state
+      - check-success=Test stable zebra-state with fake activation heights on ubuntu-latest
+      - check-success=Test stable on ubuntu-latest
+      - check-success=Test stable on macOS-latest
+      - check-success=Test stable on windows-latest
+      - check-success=Coverage nightly
+      - check-success=Clippy
+      - check-success=Rustfmt
 
 pull_request_rules:
   - name: move to urgent queue when CI passes with 1 review and not WIP targeting main

diff --git a/.github/workflows/ci.patch.yml b/.github/workflows/ci.patch.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   test:
-    name: Test (+${{ matrix.rust }}) on ${{ matrix.os }}
+    name: Test ${{ matrix.rust }} on ${{ matrix.os }}
     # The large timeout is to accommodate:
     # - Windows builds (75 minutes, typically 30-50 minutes)
     # - parameter downloads (40 minutes, but only when the cache expires)
@@ -29,7 +29,7 @@ jobs:
       - run: 'echo "No build required"'
 
   test-fake-activation-heights:
-    name: Build (+${{ matrix.rust }}) zebra-state with fake activation heights on ubuntu-latest
+    name: Test ${{ matrix.rust }} zebra-state with fake activation heights on ubuntu-latest
     timeout-minutes: 60
     runs-on: ubuntu-latest
     strategy:
@@ -40,7 +40,7 @@ jobs:
       - run: 'echo "No build required"'
 
   build-chain-no-features:
-    name: Build (+${{ matrix.rust }}) zebra-chain w/o features on ubuntu-latest
+    name: Build ${{ matrix.rust }} zebra-chain w/o features on ubuntu-latest
     timeout-minutes: 60
     runs-on: ubuntu-latest
     strategy:
@@ -51,15 +51,15 @@ jobs:
       - run: 'echo "No build required"'
 
   build:
-    name: Build (+stable) on ubuntu-latest
+    name: Build stable on ubuntu-latest
     timeout-minutes: 60
     runs-on: ubuntu-latest
 
     steps:
       - run: 'echo "No build required"'
 
   cargo-deny:
-    name: Check deny.toml crate dependencies and validate licenses
+    name: Check deny.toml ${{ matrix.checks }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ env:
 
 jobs:
   test:
-    name: Test (+${{ matrix.rust }}) on ${{ matrix.os }}
+    name: Test ${{ matrix.rust }} on ${{ matrix.os }}
     # The large timeout is to accommodate:
     # - Windows builds (75 minutes, typically 30-50 minutes)
     # - parameter downloads (40 minutes, but only when the cache expires)
@@ -117,7 +117,7 @@ jobs:
           args: --verbose --package zebrad --test acceptance sync_large_checkpoints_ -- --ignored
 
   test-fake-activation-heights:
-    name: Build (+${{ matrix.rust }}) zebra-state with fake activation heights on ubuntu-latest
+    name: Test ${{ matrix.rust }} zebra-state with fake activation heights on ubuntu-latest
     timeout-minutes: 60
     runs-on: ubuntu-latest
     strategy:
@@ -158,7 +158,7 @@ jobs:
           args: --verbose --package zebra-state --lib -- with_fake_activation_heights
 
   build-chain-no-features:
-    name: Build (+${{ matrix.rust }}) zebra-chain w/o features on ubuntu-latest
+    name: Build ${{ matrix.rust }} zebra-chain w/o features on ubuntu-latest
     timeout-minutes: 60
     runs-on: ubuntu-latest
     strategy:
@@ -188,7 +188,7 @@ jobs:
         run: cargo build --verbose --no-default-features
 
   build:
-    name: Build (+stable) on ubuntu-latest
+    name: Build stable on ubuntu-latest
     timeout-minutes: 60
     runs-on: ubuntu-latest
 
@@ -224,7 +224,7 @@ jobs:
           args: --verbose --release
 
   cargo-deny:
-    name: Check deny.toml crate dependencies and validate licenses
+    name: Check deny.toml ${{ matrix.checks }}
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.github/workflows/coverage.patch.yml b/.github/workflows/coverage.patch.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   coverage:
-    name: Coverage (+nightly)
+    name: Coverage nightly
     # The large timeout is to accommodate:
     # - nightly builds (75 minutes, typically 30-50 minutes)
     # - parameter downloads (40 minutes, but only when the cache expires)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -17,7 +17,7 @@ env:
 
 jobs:
   coverage:
-    name: Coverage (+nightly)
+    name: Coverage nightly
     # The large timeout is to accommodate:
     # - nightly builds (75 minutes, typically 30-50 minutes)
     # - parameter downloads (40 minutes, but only when the cache expires)

diff --git a/.github/workflows/test.patch.yml b/.github/workflows/test.patch.yml
@@ -0,0 +1,63 @@
+name: Test
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '**/*.rs'
+      - '**/*.txt'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - 'docker/**'
+      - '.github/workflows/test.yml'
+
+jobs:
+  build:
+    name: Build images
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "No build required"'
+
+  # Run all the zebra tests, including tests that are ignored by default
+  test-all:
+    name: Test all
+    runs-on: ubuntu-latest
+    needs: build
+    if: ${{ github.event.inputs.regenerate-disks != 'true' }}
+    steps:
+      - run: 'echo "No build required"'
+
+  test-fake-activation-heights:
+    name: Test with fake activation heights
+    runs-on: ubuntu-latest
+    needs: build
+    if: ${{ github.event.inputs.regenerate-disks != 'true' }}
+    steps:
+      - run: 'echo "No build required"'
+
+  # Test that Zebra syncs and checkpoints a few thousand blocks from an empty state
+  test-empty-sync:
+    name: Test checkpoint sync from empty state
+    runs-on: ubuntu-latest
+    needs: build
+    if: ${{ github.event.inputs.regenerate-disks != 'true' }}
+    steps:
+      - run: 'echo "No build required"'
+
+  regenerate-stateful-disks:
+    name: Regenerate stateful disks
+    runs-on: ubuntu-latest
+    needs: build
+    outputs:
+      disk_short_sha: ${{ steps.disk-short-sha.outputs.disk_short_sha }}
+    steps:
+      - run: 'echo "No build required"'
+
+  # Test that Zebra syncs and fully validates a few thousand blocks from a cached post-checkpoint state
+  test-stateful-sync:
+    name: Test full validation sync from cached state
+    runs-on: ubuntu-latest
+    needs: [ build, regenerate-stateful-disks]
+    steps:
+      - run: 'echo "No build required"'