diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7d0a393041..2baa6785d3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,9 @@ on: # we want to run the CI on every PR targetting those branches branches: [master, dev, release/*] + merge_group: + branches: [master, dev, release/*] + push: # We also run CI on dev in order to update the coverage monitoring branches: [dev] diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 774c7434a0d..a6501d32e8b 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -5,7 +5,9 @@ # Source repository: https://github.com/actions/dependency-review-action # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement name: 'Dependency Review' -on: [pull_request] +on: + pull_request: + merge_group: permissions: contents: read diff --git a/.github/workflows/jira-lint-and-link.yml b/.github/workflows/jira-lint-and-link.yml index 6c93c9a395e..6f5503c996a 100644 --- a/.github/workflows/jira-lint-and-link.yml +++ b/.github/workflows/jira-lint-and-link.yml @@ -2,13 +2,20 @@ name: Link and Lint PR with Jira Ticket Number on: pull_request: types: [opened, edited, synchronize] + merge_group: + branches: [dev] jobs: add-jira-description: - # avoid triggering this action on dependabot PRs - if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'otto-the-bot' }} + # On merge_group there is no pull request payload; keep the required check green there. + if: ${{ github.event_name == 'merge_group' || (github.actor != 'dependabot[bot]' && github.actor != 'otto-the-bot') }} runs-on: ubuntu-latest steps: + - name: Skip on merge queue + if: ${{ github.event_name == 'merge_group' }} + run: echo "Skipping Jira pull request description validation on merge queue." + - uses: cakeinpanic/jira-description-action@master + if: ${{ github.event_name == 'pull_request' }} name: jira-description-action with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/semantic-commit-lint.yml b/.github/workflows/semantic-commit-lint.yml index 910e821d8c1..b56080c3e66 100644 --- a/.github/workflows/semantic-commit-lint.yml +++ b/.github/workflows/semantic-commit-lint.yml @@ -3,6 +3,8 @@ name: 'Semantic Commit Linting of PR titles' on: pull_request_target: types: [opened, edited, synchronize] + merge_group: + branches: [master, dev, release/*] permissions: statuses: write @@ -11,9 +13,14 @@ jobs: semantic-commit-pr-title-lint: runs-on: ubuntu-latest steps: + - name: Skip on merge queue + if: ${{ github.event_name == 'merge_group' }} + run: echo "Skipping semantic PR title lint on merge queue." + # Please look up the latest version from # https://github.com/amannn/action-semantic-pull-request/releases - name: Run Semantic Commint Linter + if: ${{ github.event_name == 'pull_request_target' }} uses: amannn/action-semantic-pull-request@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}