From 26698bf2c453124b2adf2021b4725f21ee5aca39 Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Mon, 7 Nov 2022 11:59:32 +1000
Subject: [PATCH] fix(ci): Run required jobs on dependent PRs (#5550)

* Run CI jobs on dependent PRs

* Change job names to be unique

* Fix outdated workflow name

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 .github/workflows/continous-delivery.yml                 | 1 +
 .github/workflows/continous-integration-docker.patch.yml | 2 +-
 .github/workflows/continous-integration-docker.yml       | 2 +-
 .github/workflows/continous-integration-os.yml           | 2 +-
 .github/workflows/lint.patch.yml                         | 2 --
 .github/workflows/lint.yml                               | 2 --
 .github/workflows/release-binaries.yml                   | 1 +
 .github/workflows/zcash-lightwalletd.patch.yml           | 4 +---
 .github/workflows/zcash-lightwalletd.yml                 | 4 +---
 .github/workflows/zcash-params.yml                       | 1 +
 10 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml
index de5481c8..93fdb42d 100644
--- a/.github/workflows/continous-delivery.yml
+++ b/.github/workflows/continous-delivery.yml
@@ -65,6 +65,7 @@ jobs:
   #
   # The image will be commonly named `zebrad:<short-hash | github-ref | semver>`
   build:
+    name: Build CD Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
diff --git a/.github/workflows/continous-integration-docker.patch.yml b/.github/workflows/continous-integration-docker.patch.yml
index 5cf68554..a9a4bd47 100644
--- a/.github/workflows/continous-integration-docker.patch.yml
+++ b/.github/workflows/continous-integration-docker.patch.yml
@@ -31,7 +31,7 @@ jobs:
       - run: 'echo "No build required"'
 
   build:
-    name: Build / Build images
+    name: Build CI Docker / Build images
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/continous-integration-docker.yml b/.github/workflows/continous-integration-docker.yml
index 126a88e5..370fbaaf 100644
--- a/.github/workflows/continous-integration-docker.yml
+++ b/.github/workflows/continous-integration-docker.yml
@@ -165,7 +165,7 @@ jobs:
           fi
 
   build:
-    name: Build
+    name: Build CI Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
diff --git a/.github/workflows/continous-integration-os.yml b/.github/workflows/continous-integration-os.yml
index 92d3d0c5..b14aa689 100644
--- a/.github/workflows/continous-integration-os.yml
+++ b/.github/workflows/continous-integration-os.yml
@@ -28,7 +28,7 @@ on:
       - '.cargo/config.toml'
       - '**/clippy.toml'
       # workflow definitions
-      - '.github/workflows/ci.yml'
+      - '.github/workflows/continous-integration-os.yml'
   pull_request:
     paths:
       # code and tests
diff --git a/.github/workflows/lint.patch.yml b/.github/workflows/lint.patch.yml
index d6462a1a..840402c8 100644
--- a/.github/workflows/lint.patch.yml
+++ b/.github/workflows/lint.patch.yml
@@ -2,8 +2,6 @@ name: Lint
 
 on:
   pull_request:
-    branches:
-      - 'main'
 
 jobs:
   clippy:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 785e1bc8..9ce9ca87 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,8 +14,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - 'main'
 
 env:
   CARGO_INCREMENTAL: 0
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 4c74e9b1..71373cca 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -20,6 +20,7 @@ jobs:
   #
   # The image will be named `zebrad:<semver>`
   build:
+    name: Build Release Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
diff --git a/.github/workflows/zcash-lightwalletd.patch.yml b/.github/workflows/zcash-lightwalletd.patch.yml
index e3d45e49..1c4413c2 100644
--- a/.github/workflows/zcash-lightwalletd.patch.yml
+++ b/.github/workflows/zcash-lightwalletd.patch.yml
@@ -4,8 +4,6 @@ name: zcash-lightwalletd
 # run a fake CI job to satisfy the branch protection rules.
 on:
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - 'zebra-rpc/**'
       - 'zebrad/tests/acceptance.rs'
@@ -16,7 +14,7 @@ on:
 
 jobs:
   build:
-    name: Build images
+    name: Build lightwalletd Docker
     runs-on: ubuntu-latest
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/zcash-lightwalletd.yml b/.github/workflows/zcash-lightwalletd.yml
index 9a14c65a..71127c74 100644
--- a/.github/workflows/zcash-lightwalletd.yml
+++ b/.github/workflows/zcash-lightwalletd.yml
@@ -31,8 +31,6 @@ on:
 
   # Update the lightwalletd image when each related PR changes
   pull_request:
-    branches:
-      - main
     paths:
       # rebuild lightwalletd whenever the related Zebra code changes
       # (this code isn't actually compiled in this docker image)
@@ -50,7 +48,7 @@ env:
 
 jobs:
   build:
-    name: Build images
+    name: Build lightwalletd Docker
     runs-on: ubuntu-latest
     permissions:
       contents: 'read'
diff --git a/.github/workflows/zcash-params.yml b/.github/workflows/zcash-params.yml
index e283c744..4574ad1f 100644
--- a/.github/workflows/zcash-params.yml
+++ b/.github/workflows/zcash-params.yml
@@ -24,6 +24,7 @@ on:
 
 jobs:
   build:
+    name: Build Zcash Params Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/zcash-params/Dockerfile