diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9634ee5..87b8563 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,6 +20,7 @@ on: pull_request: push: branches: [main] + merge_group: permissions: contents: read @@ -31,7 +32,7 @@ jobs: timeout-minutes: 10 concurrency: group: ci-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.event_name == 'pull_request' }} steps: - uses: actions/checkout@v7