diff --git a/.github/workflows/liquidation-reconstitution.yml b/.github/workflows/liquidation-reconstitution.yml index bfb402ed..128fa9c6 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' || + 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 index d3389d4c..0cd835f3 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' || + contains(github.event.pull_request.labels.*.name, 'liquidation-testing') uses: ./.github/workflows/reusable-workflow.yml with: docker_compose_command: |