fix(ci): address ZSA integration CI issues

.config/nextest.toml

@@ -130,3 +130,13 @@ default-filter = 'package(zebrad) and test(=lightwalletd_test_suite)'
 [profile.rpc-z-getsubtreesbyindex-snapshot]
 slow-timeout = { period = "30m", terminate-after = 2 }
 default-filter = 'package(zebrad) and test(=fully_synced_rpc_z_getsubtreesbyindex_snapshot_test)'
+
+# --- QEDIT temporary retries ---
+
+# TODO: Remove retries after investigating periodic random failures.
+# Add more tests here only after confirming similar intermittent failures.
+[[profile.default.overrides]]
+filter = '''
+test(=sync_large_checkpoints_mempool_mainnet)
+'''
+retries = 3

.github/workflows/ci-basic.yml

@@ -7,6 +7,7 @@ permissions:
 
 jobs:
   test:
+    if: ${{ github.repository == 'QED-it/zebra' }}
     runs-on: ubuntu-latest
 
     strategy:
@@ -54,31 +55,20 @@ jobs:
           sed -i 's|.*"--cfg", .feature="tx_v6".*|# &|' .cargo/config.toml
           sed -i 's|.*"--cfg", "zcash_unstable=\\"nu7\\"".*|# &|' .cargo/config.toml
 
-      - name: Run non-network tests
-        env:
-          SKIP_NETWORK_TESTS: "1"
-        run: timeout --preserve-status 1h cargo test --verbose --locked
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@305bebabd4457bed9b82541755f034994382465b # v2.68.10
+        with:
+          tool: cargo-nextest
 
-      - name: Run network-sensitive tests
+      - name: Run tests
         run: |
-          for attempt in 1 2 3; do
-            echo "network-sensitive tests attempt ${attempt}"
-
-            timeout --preserve-status 45m bash -c '
-              set -euo pipefail
-              cargo test -p zebra-network --lib --verbose --locked -- --test-threads=1
-              cargo test -p zebrad --test acceptance --verbose --locked -- --test-threads=1
-            ' && exit 0
-
-            status=$?
-            echo "network-sensitive tests attempt ${attempt} failed with status ${status}"
+          timeout --preserve-status 1h \
+            cargo nextest run --workspace --locked
 
-            if [ "${attempt}" = "3" ]; then
-              exit "${status}"
-            fi
-
-            sleep 30
-          done
+      - name: Run doc tests
+        run: |
+          timeout --preserve-status 30m \
+            cargo test --doc --workspace --locked
 
       - name: Run doc check
         run: cargo doc --workspace --no-deps --all-features --document-private-items --locked

.github/workflows/lint.yml

@@ -2,10 +2,10 @@ name: Lint
 
 on:
   pull_request:
-    # Temporarily allow CI on the QEDIT integration branch.
-    # TODO: Remove v4.2.0-dev before merging upstream.
     branches:
       - main
+      # TODO: Temporary ZSA integration branches. Remove before merging to main.
+      - zsa-support
       - v4.2.0-dev
     paths:
       - "**/*.rs"
@@ -16,11 +16,7 @@ on:
       - .github/workflows/lint.yml
 
   push:
-    # Temporarily allow CI on the QEDIT integration branch.
-    # TODO: Remove v4.2.0-dev before merging upstream.
-    branches:
-      - main
-      - v4.2.0-dev
+    branches: [main]
     paths:
       - "**/*.rs"
       - "**/Cargo.toml"
@@ -54,7 +50,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust-version: [stable, beta]
+        # TODO: QED-it temporary Rust 1.94 pin: stable when testing Zebra v4.2.0 on upstream CI; remove before upstream merge.
+        rust-version: [1.94]
         type: [release, tests]
         include:
           - type: release
@@ -75,8 +72,7 @@ jobs:
           cache-on-failure: true
       - uses: ./.github/actions/setup-zebra-build
       - name: Run clippy
-        # TODO: Temporary QED-it fork exception for clippy::manual_option_zip; remove before merging this branch upstream.
-        run: cargo clippy ${{ matrix.args }} --features "${{ matrix.features }}" -- -A unknown-lints -A clippy::manual_option_zip
+        run: cargo clippy ${{ matrix.args }} --features "${{ matrix.features }}"
 
   crate-checks:
     permissions:
@@ -170,11 +166,13 @@ jobs:
           persist-credentials: false
       - uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
         with:
-          toolchain: nightly
+          # TODO: QED-it temp nightly pin: matches Zebra v4.2.0 CI test period; remove before upstream merge.
+          toolchain: nightly-2026-03-06
           cache-on-failure: true
       - uses: taiki-e/install-action@305bebabd4457bed9b82541755f034994382465b #v2.68.10
         with:
-          tool: cargo-udeps
+          # TODO: QED-it temp cargo-udeps 0.1.60 pin: stable for Zebra v4.2.0 CI; remove before upstream merge.
+          tool: cargo-udeps@0.1.60
       - uses: ./.github/actions/setup-zebra-build
       - run: cargo udeps --workspace --all-targets --all-features --locked
 

.github/workflows/test-crates.yml

@@ -2,7 +2,11 @@ name: Test Crate Build
 
 on:
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      # TODO: Temporary ZSA integration branches. Remove before merging to main.
+      - zsa-support
+      - v4.2.0-dev
     paths:
       - "**/*.rs"
       - "**/Cargo.toml"
@@ -57,7 +61,8 @@ jobs:
 
       - uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
         with:
-          toolchain: stable
+          # TODO: QED-it temp Rust 1.94 pin: stable for Zebra v4.2.0 CI; remove before upstream merge.
+          toolchain: "1.94"
           components: clippy
           cache-on-failure: true
       - uses: ./.github/actions/setup-zebra-build
@@ -109,7 +114,8 @@ jobs:
 
       - uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c #v1.15.2
         with:
-          toolchain: stable
+          # TODO: QED-it temp Rust 1.94 pin: stable for Zebra v4.2.0 CI; remove before upstream merge.
+          toolchain: "1.94"
           components: clippy
           cache-key: crate-build-${{ matrix.crate }}
           cache-on-failure: true
@@ -184,7 +190,6 @@ jobs:
           cargo clippy --package ${{ matrix.crate }} --all-features --all-targets -- -D warnings
           cargo build --package ${{ matrix.crate }} --all-features --all-targets
 
-
   test-crate-build-success:
     name: test crate build success
     runs-on: ubuntu-latest

.github/workflows/test-docker.yml

@@ -2,7 +2,11 @@ name: Test Docker Config
 
 on:
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      # TODO: Temporary ZSA integration branches. Remove before merging to main.
+      - zsa-support
+      - v4.2.0-dev
     paths:
       - "**/*.rs"
       - "**/Cargo.toml"

.github/workflows/tests-unit.yml

@@ -2,7 +2,11 @@ name: Unit Tests
 
 on:
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      # TODO: Temporary ZSA integration branches. Remove before merging to main.
+      - zsa-support
+      - v4.2.0-dev
     paths:
       - "**/*.rs"
       - "**/Cargo.toml"

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable"
+channel = "1.94.0"