From d3a60e210db19cc7cb181a25cec438c98f5dbd5f Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Tue, 21 Nov 2023 06:11:42 +1000
Subject: [PATCH] Simplify job structure

---
 .../ci-unit-tests-docker.patch-external.yml         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-unit-tests-docker.patch-external.yml b/.github/workflows/ci-unit-tests-docker.patch-external.yml
index 326209144fb..f314a92306c 100644
--- a/.github/workflows/ci-unit-tests-docker.patch-external.yml
+++ b/.github/workflows/ci-unit-tests-docker.patch-external.yml
@@ -21,42 +21,43 @@ jobs:
 
   test-all:
     name: Test all
-    if: ${{ !contains(github.head_ref || github.ref, 'refs/heads/') }}
+    # This dependency allows all these jobs to depend on a single condition, making it easier to change.
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
 
   test-fake-activation-heights:
     name: Test with fake activation heights
-    if: ${{ !contains(github.head_ref || github.ref, 'refs/heads/') }}
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
 
   test-empty-sync:
     name: Test checkpoint sync from empty state
-    if: ${{ !contains(github.head_ref || github.ref, 'refs/heads/') }}
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
 
   test-lightwalletd-integration:
     name: Test integration with lightwalletd
-    if: ${{ !contains(github.head_ref || github.ref, 'refs/heads/') }}
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
 
   test-configuration-file:
     name: Test CI default Docker config file / Test default-conf in Docker
-    if: ${{ !contains(github.head_ref || github.ref, 'refs/heads/') }}
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
 
   test-zebra-conf-path:
     name: Test CI custom Docker config file / Test custom-conf in Docker
-    if: ${{ !contains(github.head_ref || github.ref, 'refs/heads/') }}
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'