From fc576b09e792ab93125d81e14ef7f76c3c04dd88 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 6 Mar 2026 02:56:21 -0800 Subject: [PATCH 1/3] Enable merge groups to automate PR rebasing This change adds merge_group triggers to GitHub Actions workflows, enabling automated merge queue processing. This eliminates the need for manual PR rebasing when multiple PRs are queued for merging. Updated workflows: - api-level-lint.yml - codeql-analysis.yml - gradle-build.yml - sonarcloud.yml Aligns with changes from microsoft/kiota#6952 Co-Authored-By: Claude Sonnet 4.5 --- .github/workflows/api-level-lint.yml | 1 + .github/workflows/codeql-analysis.yml | 1 + .github/workflows/gradle-build.yml | 1 + .github/workflows/sonarcloud.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index acebe48a..13e4aad9 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -6,6 +6,7 @@ on: branches: [main, support/2.x.x] pull_request: branches: [main, support/2.x.x] + merge_group: jobs: lint-api-level: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index eb82f433..3974579e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,6 +17,7 @@ on: pull_request: # The branches below must be a subset of the branches above branches: [main, support/2.x.x] + merge_group: schedule: - cron: '0 1 * * 4' workflow_dispatch: diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index da9bed37..449b9bb4 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -3,6 +3,7 @@ name: Java CI with Gradle on: pull_request: branches: [main, support/2.x.x] + merge_group: workflow_dispatch: jobs: diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 32910aee..b2e79591 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -5,6 +5,7 @@ on: branches: [main, support/2.x.x] pull_request: types: [opened, synchronize, reopened] + merge_group: env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 33f9b5c7d9d6d7703d663a935a405cef12c0cd71 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 6 Mar 2026 03:08:42 -0800 Subject: [PATCH 2/3] Enable merge groups for conflicting-pr-label workflow Adds merge_group trigger to the conflicting-pr-label workflow to enable automatic merge group handling, consistent with other CI workflows in this repository (codeql-analysis, gradle-build, sonarcloud, api-level-lint). This change eliminates the need to manually rebase PRs when using merge queues. Adapted from microsoft/kiota#6952 Co-Authored-By: Claude Sonnet 4.5 --- .github/workflows/conflicting-pr-label.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index 0e042897..d4242f81 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -11,6 +11,7 @@ on: pull_request: types: [synchronize] branches: [main, support/2.x.x] + merge_group: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: From 0dde1a141883c3240a3a0646e8e3727ae1cf356b Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 6 Mar 2026 03:47:21 -0800 Subject: [PATCH 3/3] ci: enable merge groups for auto-merge-dependabot workflow Adds merge_group trigger to the auto-merge-dependabot workflow to enable automated PR rebasing through GitHub's merge queue feature, reducing manual intervention during the merge process. This change aligns with the equivalent update from microsoft/kiota PR #6952. Signed-off-by: Claude Sonnet 4.5 Co-Authored-By: Claude Sonnet 4.5 --- .github/workflows/auto-merge-dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index d454cd18..c93b4712 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -3,6 +3,7 @@ name: Auto-merge dependabot updates on: pull_request: branches: [ main ] + merge_group: permissions: pull-requests: write