From 055154173b15e9d70f95f0262df17232ff27f274 Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Wed, 12 Mar 2025 18:47:58 +0800
Subject: [PATCH] ci: add workflow to cancel ongoing runs on pull request merge

---
 .github/workflows/cancel-workflow-on-merge.yml | 15 +++++++++++++++
 .github/workflows/tdengine-ci-test.yml         |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/cancel-workflow-on-merge.yml

diff --git a/.github/workflows/cancel-workflow-on-merge.yml b/.github/workflows/cancel-workflow-on-merge.yml
new file mode 100644
index 0000000000..4cd915b526
--- /dev/null
+++ b/.github/workflows/cancel-workflow-on-merge.yml
@@ -0,0 +1,15 @@
+name: Cancel Workflow on Merge
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  cancel-workflow:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Workflow if Merged
+        if: ${{ github.event.pull_request.merged }}
+        run: |
+          echo "PR has been merged, cancelling workflow..."
+          gh run cancel --repo ${{ github.repository }} --workflow "TDengine Test" --branch ${{ github.event.pull_request.base.ref }}
\ No newline at end of file
diff --git a/.github/workflows/tdengine-ci-test.yml b/.github/workflows/tdengine-ci-test.yml
index d11b363679..6ce0c4cef4 100644
--- a/.github/workflows/tdengine-ci-test.yml
+++ b/.github/workflows/tdengine-ci-test.yml
@@ -11,7 +11,7 @@ on:
       - 'docs/**'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-TDengine
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 env:
@@ -91,4 +91,4 @@ jobs:
     needs: fetch-parameters
     if: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }}
     with:
-      tdinternal: false
+      tdinternal: false
\ No newline at end of file