From e039d2f74574d01d9bcc79f4d608a3a67ade8405 Mon Sep 17 00:00:00 2001
From: rabi-siddique <rabisiddique27@gmail.com>
Date: Tue, 20 Aug 2024 17:11:59 +0500
Subject: [PATCH] ci: update concurrency group to be specific for liquidation
 testing

---
 .github/workflows/liquidation-reconstitution.yml | 9 +++++++--
 .github/workflows/liquidation.yml                | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/liquidation-reconstitution.yml b/.github/workflows/liquidation-reconstitution.yml
index bfb402ed..fe6de5bc 100644
--- a/.github/workflows/liquidation-reconstitution.yml
+++ b/.github/workflows/liquidation-reconstitution.yml
@@ -37,14 +37,19 @@ on:
   pull_request:
     types:
       - labeled
+      - unlabeled
+      - synchronize
 
 concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   run-e2e:
-    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(github.event.label.name, 'liquidation-reconstitution-testing')
+    if: >-
+      github.event_name != 'pull_request' || github.event_name == 'schedule' || 
+      github.event_name == 'workflow_dispatch' || 
+      ${{ github.event.label.name == 'liquidation-reconstitution-testing' }}
     uses: ./.github/workflows/reusable-workflow.yml
     with:
       docker_compose_command: |
diff --git a/.github/workflows/liquidation.yml b/.github/workflows/liquidation.yml
index d3389d4c..b1fc7b3d 100644
--- a/.github/workflows/liquidation.yml
+++ b/.github/workflows/liquidation.yml
@@ -37,14 +37,19 @@ on:
   pull_request:
     types:
       - labeled
+      - unlabeled
+      - synchronize
 
 concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   run-e2e:
-    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || contains(github.event.label.name, 'liquidation-testing')
+    if: >-
+      github.event_name != 'pull_request' || github.event_name == 'schedule' || 
+      github.event_name == 'workflow_dispatch' || 
+      ${{ github.event.label.name == 'liquidation-testing' }}
     uses: ./.github/workflows/reusable-workflow.yml
     with:
       docker_compose_command: |