diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 50a65578925..ae2ae2885b3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,6 +9,7 @@ on: branches: - develop - releases/** + merge_group: concurrency: group: ci-${{github.ref}}-${{github.event.pull_request.number || github.run_number}} @@ -25,13 +26,17 @@ jobs: packages: ${{ steps.filter.outputs.packages }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - if: ${{ github.event_name == 'push' }} + if: ${{ github.event_name == 'push' || github.event_name == 'merge_group' }} with: fetch-depth: 0 # For pull requests it's not necessary to checkout the code - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 id: filter with: + # For merge group events, compare against the target branch (main) + base: ${{ github.event_name == 'merge_group' && github.event.merge_group.base_ref || '' }} + # For merge group events, use the merge group head ref + ref: ${{ github.event_name == 'merge_group' && github.event.merge_group.head_sha || github.ref }} # See https://github.com/dorny/paths-filter/issues/56 for the syntax used below # Don't run if we only modified packages in the # built-in repository or documentation