diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9cef1028..9540265d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,12 +6,13 @@ on: - main concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-${{ github.event.pull_request.merged }} cancel-in-progress: true jobs: build: runs-on: ubuntu-24.04 + if: github.event.pull_request.merged == false steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cd124f4f..32b62471 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,12 +6,13 @@ on: - main concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-${{ github.event.pull_request.merged }} cancel-in-progress: true jobs: test: runs-on: ubuntu-24.04 + if: github.event.pull_request.merged == false steps: - uses: actions/checkout@v4