From df64d3137a448a94abbf6c8d01a609d6467e8136 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@sangoma.com>
Date: Mon, 2 Mar 2026 10:17:57 -0700
Subject: [PATCH] .github: Replace separate check, cpcheck and merge workflows
 with OnPRAction

---
 .github/workflows/OnPRAction.yml        | 10 ++++++++++
 .github/workflows/OnPRCPCheck.yml       | 14 --------------
 .github/workflows/OnPRCheck.yml         | 14 --------------
 .github/workflows/OnPRMergeApproved.yml | 14 --------------
 4 files changed, 10 insertions(+), 42 deletions(-)
 create mode 100644 .github/workflows/OnPRAction.yml
 delete mode 100644 .github/workflows/OnPRCPCheck.yml
 delete mode 100644 .github/workflows/OnPRCheck.yml
 delete mode 100644 .github/workflows/OnPRMergeApproved.yml

diff --git a/.github/workflows/OnPRAction.yml b/.github/workflows/OnPRAction.yml
new file mode 100644
index 0000000000..794cf0259b
--- /dev/null
+++ b/.github/workflows/OnPRAction.yml
@@ -0,0 +1,10 @@
+name: PR
+run-name: "PR ${{ github.event.number }} ${{github.event.action}}${{ case(github.event.action == 'labeled', format('({0})', github.event.label.name) , '') }} by ${{ github.actor }}"
+on:
+  pull_request_target:
+    types: [ opened, reopened, synchronize, labeled ]
+
+jobs:
+  PRAction:
+    name: "Action"
+    uses: asterisk/asterisk-ci-actions/.github/workflows/AsteriskPRAction.yml@main
diff --git a/.github/workflows/OnPRCPCheck.yml b/.github/workflows/OnPRCPCheck.yml
deleted file mode 100644
index 96c04002dc..0000000000
--- a/.github/workflows/OnPRCPCheck.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: PRCPCheck
-run-name: "PR ${{ github.event.number }} CPCheck by ${{ github.actor }}"
-on:
-  pull_request_target:
-    types: [ labeled ]
-
-jobs:
-  PRCPCheck:
-    name: "run-cpcheck"
-    if: ${{ github.event.label.name == vars.CHERRY_PICK_TEST_LABEL }}
-    concurrency:
-      group: cpcheck-${{ github.triggering_actor }}-${{ github.head_ref }}
-      cancel-in-progress: true
-    uses: asterisk/asterisk-ci-actions/.github/workflows/AsteriskPRCPCheck.yml@main
diff --git a/.github/workflows/OnPRCheck.yml b/.github/workflows/OnPRCheck.yml
deleted file mode 100644
index 53aec0173e..0000000000
--- a/.github/workflows/OnPRCheck.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: PRCheck
-run-name: "PR ${{ github.event.number }} Check(${{github.event.action}}) by ${{ github.actor }}"
-on:
-  pull_request_target:
-    types: [ opened, reopened, synchronize, labeled ]
-
-jobs:
-  PRCheck:
-    name: "run-check"
-    if: ${{ (github.event.action != 'labeled') || (github.event.action == 'labeled' && github.event.label.name == vars.RECHECKPR_LABEL) }}
-    concurrency:
-      group: check-${{ github.triggering_actor }}-${{ github.head_ref }}
-      cancel-in-progress: true
-    uses: asterisk/asterisk-ci-actions/.github/workflows/AsteriskPRCheck.yml@main
diff --git a/.github/workflows/OnPRMergeApproved.yml b/.github/workflows/OnPRMergeApproved.yml
deleted file mode 100644
index 8c24505574..0000000000
--- a/.github/workflows/OnPRMergeApproved.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: PRMerge
-run-name: "PR ${{ github.event.number }} Merge by ${{ github.actor }}"
-on:
-  pull_request_target:
-    types: [ labeled ]
-
-jobs:
-  PRMerge:
-    name: "run-merge"
-    if: contains(fromJSON(vars.MERGE_APPROVED_LABELS), github.event.label.name)
-    concurrency:
-      group: merge-${{ github.triggering_actor }}-${{ github.head_ref }}
-      cancel-in-progress: true
-    uses: asterisk/asterisk-ci-actions/.github/workflows/AsteriskPRMerge.yml@main