From 4f4c9c42c9072c76599f0f1ce8c32326a3a3bd8e Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Wed, 22 Jun 2022 11:18:49 +1000
Subject: [PATCH] fix(ci): update OS patch jobs for Rust & feature changes
 (#4668)

* Update OS patch jobs for Rust & feature changes

* Restore a patch job that is actually deleted in another PR
---
 .../continous-integration-os.patch.yml        | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/continous-integration-os.patch.yml b/.github/workflows/continous-integration-os.patch.yml
index 88d05fa1..21f592b6 100644
--- a/.github/workflows/continous-integration-os.patch.yml
+++ b/.github/workflows/continous-integration-os.patch.yml
@@ -14,28 +14,15 @@ on:
 jobs:
   test:
     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)
-    timeout-minutes: 115
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
         # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801
         os: [ubuntu-latest, macos-latest]
-        rust: [stable]
-
-    steps:
-      - run: 'echo "No build required"'
-
-  test-fake-activation-heights:
-    name: Test ${{ matrix.rust }} zebra-state with fake activation heights on ubuntu-latest
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: [stable]
+        rust: [stable, beta]
+        exclude:
+          - os: macos-latest
+            rust: beta
 
     steps:
       - run: 'echo "No build required"'
@@ -53,7 +40,6 @@ jobs:
 
   install-from-lockfile-no-cache:
     name: Install zebrad from lockfile without cache on ubuntu-latest
-    timeout-minutes: 60
     runs-on: ubuntu-latest
 
     steps:
@@ -61,23 +47,20 @@ jobs:
 
   check-cargo-lock:
     name: Check Cargo.lock is up to date
-    timeout-minutes: 60
     runs-on: ubuntu-latest
 
     steps:
       - run: 'echo "No build required"'
 
   cargo-deny:
-    name: Check deny.toml ${{ matrix.checks }}
+    name: Check deny.toml ${{ matrix.checks }} ${{ matrix.features }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         checks:
           - bans
           - sources
-
-    # Prevent sudden announcement of a new advisory from failing ci:
-    continue-on-error: ${{ matrix.checks == 'advisories' }}
+        features: ['', '--all-features', '--no-default-features']
 
     steps:
       - run: 'echo "No build required"'