ci: update concurrency group to be specific for liquidation testing

Agoric · Aug 21, 2024 · 2a9fbed · 2a9fbed
1 parent 53f1f64
commit 2a9fbed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git 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' || 
+      contains(github.event.pull_request.labels.*.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
@@ -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' ||
+      contains(github.event.pull_request.labels.*.name, 'liquidation-testing')
     uses: ./.github/workflows/reusable-workflow.yml
     with:
       docker_compose_command: |