From 8dd2d2b859d99047b9827f08d6a0cf54115e5213 Mon Sep 17 00:00:00 2001
From: David <dgx.arnold@gmail.com>
Date: Sun, 27 Oct 2024 03:43:54 +0100
Subject: [PATCH] ci: join server test and downstream test dispatch

---
 .github/workflows/downstream.yml   | 22 ----------------------
 .github/workflows/server-tests.yml | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/downstream.yml

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
deleted file mode 100644
index 1d10c1275e..0000000000
--- a/.github/workflows/downstream.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Downstream
-
-on:
-  workflow_dispatch:
-
-jobs:
-  dispatch:
-    runs-on: "ubuntu-latest"
-    strategy:
-      matrix:
-        repo:
-          - frappe/erpnext
-          - frappe/lending
-          - frappe/hrms
-    steps:
-      - name: Dispatch Downstream CI (if supported)
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.CI_PAT }}
-          repository: ${{ matrix.repo }}
-          event-type: frappe-framework-change
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
index 5fa9967045..20979d1220 100644
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -78,3 +78,22 @@ jobs:
           fail_ci_if_error: true
           verbose: true
           flags: server
+
+  dispatch:
+    runs-on: "ubuntu-latest"
+    needs: [test, migrate]
+    if: ${{ contains( github.event.pull_request.labels.*.name, 'trigger-downstream-ci') }}
+    strategy:
+      matrix:
+        repo:
+          - frappe/erpnext
+          - frappe/lending
+          - frappe/hrms
+    steps:
+      - name: Dispatch Downstream CI (if supported)
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.CI_PAT }}
+          repository: ${{ matrix.repo }}
+          event-type: frappe-framework-change
+          client-payload: '{"frappe_sha": "${{ github.sha }}"}'